[Pkg-owncloud-commits] [owncloud] 40/44: Imported Upstream version 6.0.2+dfsg
David Prévot
taffit at moszumanska.debian.org
Fri Mar 7 13:27:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 4863f8bd5514206941407700a19d0c050b2fd2cc
Merge: 52ff8c3 071e371
Author: David Prévot <taffit at debian.org>
Date: Fri Mar 7 09:04:02 2014 -0300
Imported Upstream version 6.0.2+dfsg
.../Classes/PHPExcel/Reader/Excel2003XML.php | 6 +-
.../PHPExcel/Classes/PHPExcel/Reader/Excel2007.php | 57 ++++++---
.../PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php | 3 +-
.../PHPExcel/Classes/PHPExcel/Reader/OOCalc.php | 9 +-
3rdparty/Sabre/DAV/Client.php | 3 +-
3rdparty/Sabre/DAV/Locks/Plugin.php | 3 +-
3rdparty/Sabre/DAV/XMLUtil.php | 3 +-
3rdparty/getid3/getid3.lib.php | 3 +-
3rdparty/phpdocx/classes/CreateDocx.inc | 35 ++++--
3rdparty/phpdocx/classes/CreateMath.inc | 3 +-
3rdparty/phpdocx/classes/Docx2Text.inc | 15 ++-
3rdparty/phpdocx/classes/TransformDoc.inc | 12 +-
3rdparty/phpdocx/classes/WordML.inc | 3 +-
apps/contacts/appinfo/app.php | 6 +-
apps/contacts/lib/addressbookprovider.php | 2 +-
.../lib/controller/contactphotocontroller.php | 30 ++---
apps/contacts/lib/searchprovider.php | 12 +-
apps/files_encryption/lib/proxy.php | 33 ++++--
apps/files_encryption/lib/session.php | 8 ++
apps/files_encryption/lib/stream.php | 3 +
apps/files_encryption/lib/util.php | 8 ++
apps/files_sharing/lib/api.php | 12 +-
apps/files_sharing/templates/authenticate.php | 5 +-
apps/files_sharing/tests/api.php | 68 +++++++++++
apps/files_sharing/tests/base.php | 1 +
apps/firstrunwizard/css/colorbox.css | 8 +-
apps/firstrunwizard/templates/wizard.php | 16 ++-
apps/updater/appinfo/app.php | 4 +
apps/updater/lib/backup.php | 1 +
apps/updater/lib/downloader.php | 3 +-
apps/updater/lib/helper.php | 1 +
apps/updater/lib/location/core.php | 1 +
apps/updater/lib/updater.php | 3 +-
apps/user_ldap/user_proxy.php | 17 ++-
core/css/fixes.css | 5 -
core/css/icons.css | 9 +-
core/css/multiselect.css | 8 +-
core/css/styles.css | 12 ++
.../_sources/{ => apps}/activity/Configuration.txt | 0
.../_sources/{ => apps}/activity/Introduction.txt | 0
.../_sources/{ => apps}/activity/RSS_Feed.txt | 0
.../{ => apps}/activity/Table_of_Contents.txt | 0
.../_sources/{ => apps}/activity/Utilization.txt | 0
.../admin/_sources/{ => apps}/activity/index.txt | 0
.../admin_dependencies_chk}/Configuration.txt | 0
.../admin_dependencies_chk}/Introduction.txt | 0
.../admin_dependencies_chk}/Table_of_Contents.txt | 0
.../admin_dependencies_chk}/Utilization.txt | 0
.../admin_dependencies_chk}/index.txt | 0
.../files_antivirus}/Configuration.txt | 0
.../files_antivirus}/Introduction.txt | 0
.../files_antivirus}/Table_of_Contents.txt | 0
.../{antivirus => apps/files_antivirus}/index.txt | 0
.../files_encryption}/Configuration.txt | 0
.../files_encryption}/File_Systems.txt | 0
.../files_encryption}/Introduction.txt | 0
.../files_encryption}/Table_of_Contents.txt | 0
.../files_encryption}/index.txt | 0
.../files_external}/Configuration.txt | 0
.../files_external}/Introduction.txt | 0
.../files_external}/Table_of_Contents.txt | 0
.../{external => apps/files_external}/index.txt | 0
.../files_sharing}/Configuration.txt | 0
.../files_sharing}/Introduction.txt | 0
.../files_sharing}/Retrieving_shared_data.txt | 0
.../files_sharing}/Table_of_Contents.txt | 0
.../files_sharing}/Utilization.txt | 0
.../{share_app => apps/files_sharing}/index.txt | 0
.../files_trashbin}/Configuration_and_storage_.txt | 0
.../files_trashbin}/Introduction.txt | 0
.../files_trashbin}/Table_of_Contents.txt | 0
.../files_trashbin}/Utilization.txt | 0
.../{undelete => apps/files_trashbin}/index.txt | 0
.../files_versions}/Configuration_and_storage.txt | 0
.../files_versions}/Introduction.txt | 0
.../files_versions}/Utilization.txt | 0
.../{versions => apps/files_versions}/index.txt | 0
.../firstrunwizard}/Configuration.txt | 0
.../firstrunwizard}/Introduction.txt | 0
.../{first_run => apps/firstrunwizard}/Links.txt | 0
.../firstrunwizard}/Table_of_Contents.txt | 0
.../{first_run => apps/firstrunwizard}/Usage.txt | 0
.../{first_run => apps/firstrunwizard}/index.txt | 0
.../{LDAP => apps/user_ldap}/CONFIGURATION.txt | 0
.../{LDAP => apps/user_ldap}/Introduction.txt | 0
.../{LDAP => apps/user_ldap}/Table_of_Contents.txt | 0
.../_sources/{LDAP => apps/user_ldap}/index.txt | 0
.../_sources/{ => apps}/viewers/Configuration.txt | 0
.../_sources/{ => apps}/viewers/Introduction.txt | 0
.../_sources/{ => apps}/viewers/Utilization.txt | 0
.../admin/_sources/{ => apps}/viewers/index.txt | 0
.../doc/admin/_sources/configuration/auth_ldap.txt | 25 ++--
core/doc/admin/_sources/index.txt | 6 +-
.../_sources/installation/installation_source.txt | 1 +
.../admin/{ => apps}/activity/Configuration.html | 36 +++---
.../admin/{ => apps}/activity/Introduction.html | 34 +++---
core/doc/admin/{ => apps}/activity/RSS_Feed.html | 38 +++---
.../{ => apps}/activity/Table_of_Contents.html | 34 +++---
.../doc/admin/{ => apps}/activity/Utilization.html | 52 ++++-----
core/doc/admin/{ => apps}/activity/index.html | 34 +++---
.../admin_dependencies_chk}/Configuration.html | 36 +++---
.../admin_dependencies_chk}/Introduction.html | 34 +++---
.../admin_dependencies_chk}/Table_of_Contents.html | 34 +++---
.../admin_dependencies_chk}/Utilization.html | 36 +++---
.../admin_dependencies_chk}/index.html | 34 +++---
.../files_antivirus}/Configuration.html | 44 +++----
.../files_antivirus}/Introduction.html | 34 +++---
.../files_antivirus}/Table_of_Contents.html | 34 +++---
.../{antivirus => apps/files_antivirus}/index.html | 34 +++---
.../files_encryption}/Configuration.html | 46 ++++----
.../files_encryption}/File_Systems.html | 46 ++++----
.../files_encryption}/Introduction.html | 38 +++---
.../files_encryption}/Table_of_Contents.html | 34 +++---
.../files_encryption}/index.html | 34 +++---
.../files_external}/Configuration.html | 130 ++++++++++-----------
.../files_external}/Introduction.html | 34 +++---
.../files_external}/Table_of_Contents.html | 34 +++---
.../{external => apps/files_external}/index.html | 34 +++---
.../files_sharing}/Configuration.html | 38 +++---
.../files_sharing}/Introduction.html | 34 +++---
.../files_sharing}/Retrieving_shared_data.html | 42 +++----
.../files_sharing}/Table_of_Contents.html | 34 +++---
.../files_sharing}/Utilization.html | 44 +++----
.../{share_app => apps/files_sharing}/index.html | 34 +++---
.../Configuration_and_storage_.html | 38 +++---
.../files_trashbin}/Introduction.html | 34 +++---
.../files_trashbin}/Table_of_Contents.html | 34 +++---
.../files_trashbin}/Utilization.html | 50 ++++----
.../{undelete => apps/files_trashbin}/index.html | 34 +++---
.../files_versions}/Configuration_and_storage.html | 48 ++++----
.../files_versions}/Introduction.html | 34 +++---
.../files_versions}/Utilization.html | 44 +++----
.../{versions => apps/files_versions}/index.html | 34 +++---
.../firstrunwizard}/Configuration.html | 36 +++---
.../firstrunwizard}/Introduction.html | 34 +++---
.../{first_run => apps/firstrunwizard}/Links.html | 42 +++----
.../firstrunwizard}/Table_of_Contents.html | 34 +++---
.../{first_run => apps/firstrunwizard}/Usage.html | 38 +++---
.../{first_run => apps/firstrunwizard}/index.html | 34 +++---
.../{LDAP => apps/user_ldap}/CONFIGURATION.html | 52 ++++-----
.../{LDAP => apps/user_ldap}/Introduction.html | 34 +++---
.../user_ldap}/Table_of_Contents.html | 34 +++---
core/doc/admin/{LDAP => apps/user_ldap}/index.html | 34 +++---
.../admin/{ => apps}/viewers/Configuration.html | 38 +++---
.../doc/admin/{ => apps}/viewers/Introduction.html | 34 +++---
core/doc/admin/{ => apps}/viewers/Utilization.html | 38 +++---
core/doc/admin/{ => apps}/viewers/index.html | 34 +++---
core/doc/admin/config/APPS.html | 2 +-
core/doc/admin/config/Code_Locations.html | 2 +-
core/doc/admin/config/Default_Parameters.html | 2 +-
core/doc/admin/config/Deleted_Items.html | 2 +-
core/doc/admin/config/Introduction.html | 2 +-
core/doc/admin/config/Logging.html | 2 +-
core/doc/admin/config/Mail_Parameters.html | 2 +-
core/doc/admin/config/Maintenance.html | 2 +-
core/doc/admin/config/Miscellaneous.html | 2 +-
core/doc/admin/config/Previews.html | 2 +-
.../admin/config/Reverse_Proxy_Configurations.html | 2 +-
core/doc/admin/config/Session_Info.html | 2 +-
core/doc/admin/config/Table_of_Contents.html | 2 +-
core/doc/admin/config/User_Experience.html | 2 +-
core/doc/admin/config/Verification.html | 2 +-
core/doc/admin/config/index.html | 2 +-
core/doc/admin/configuration/auth_ldap.html | 27 ++---
core/doc/admin/configuration/background_jobs.html | 2 +-
.../configuration/configuration_3rdparty.html | 2 +-
.../admin/configuration/configuration_apps.html | 2 +-
.../configuration/configuration_automation.html | 2 +-
.../configuration_custom_clients.html | 2 +-
.../configuration/configuration_database.html | 2 +-
.../configuration/configuration_encryption.html | 2 +-
.../configuration/configuration_knowledgebase.html | 2 +-
.../configuration/configuration_language.html | 2 +-
.../admin/configuration/configuration_logging.html | 2 +-
.../admin/configuration/configuration_mail.html | 2 +-
.../configuration/configuration_maintenance.html | 2 +-
.../admin/configuration/configuration_preview.html | 2 +-
.../configuration/configuration_reverseproxy.html | 2 +-
.../admin/configuration/configuration_users.html | 2 +-
.../configuration/configuring_big_file_upload.html | 2 +-
.../admin/configuration/custom_mount_config.html | 2 +-
.../configuration/custom_mount_config_gui.html | 2 +-
.../admin/configuration/custom_user_backend.html | 2 +-
core/doc/admin/configuration/index.html | 2 +-
core/doc/admin/configuration/xsendfile.html | 2 +-
core/doc/admin/contents.html | 4 +-
core/doc/admin/cron/Introduction.html | 2 +-
core/doc/admin/cron/Usage.html | 2 +-
core/doc/admin/cron/index.html | 2 +-
core/doc/admin/genindex.html | 2 +-
core/doc/admin/index.html | 8 +-
core/doc/admin/installation/index.html | 4 +-
.../admin/installation/installation_appliance.html | 2 +-
.../doc/admin/installation/installation_linux.html | 2 +-
.../doc/admin/installation/installation_macos.html | 2 +-
.../admin/installation/installation_others.html | 2 +-
.../admin/installation/installation_source.html | 45 ++++++-
core/doc/admin/installation/installation_ucs.html | 2 +-
.../admin/installation/installation_windows.html | 2 +-
core/doc/admin/issues/index.html | 2 +-
core/doc/admin/maintenance/backup.html | 2 +-
core/doc/admin/maintenance/index.html | 2 +-
core/doc/admin/maintenance/migrating.html | 2 +-
core/doc/admin/maintenance/restore.html | 2 +-
core/doc/admin/maintenance/update.html | 2 +-
core/doc/admin/quota/Checking_available_space.html | 2 +-
core/doc/admin/quota/Excluded_from_quota.html | 2 +-
core/doc/admin/quota/Introduction.html | 2 +-
core/doc/admin/quota/Sharing.html | 2 +-
core/doc/admin/quota/Table_of_Contents.html | 2 +-
core/doc/admin/quota/index.html | 2 +-
core/doc/admin/search.html | 2 +-
core/doc/admin/sharing_api/Contents.html | 2 +-
core/doc/admin/sharing_api/Create_a_new_Share.html | 2 +-
core/doc/admin/sharing_api/Delete_Share.html | 2 +-
core/doc/admin/sharing_api/Get_All_Shares.html | 2 +-
.../Get_Information_about_a_known_share.html | 2 +-
.../Get_Shares_from_a_Specific_File_or_Folder.html | 2 +-
core/doc/admin/sharing_api/Introduction.html | 2 +-
core/doc/admin/sharing_api/index.html | 2 +-
core/doc/admin/sync_client/Advanced_Usage.html | 2 +-
core/doc/admin/sync_client/Introduction.html | 2 +-
.../admin/sync_client/Obtaining_the_Client.html | 2 +-
.../admin/sync_client/Setting_up_an_Account.html | 2 +-
core/doc/admin/sync_client/Table_of_Contents.html | 2 +-
core/doc/admin/sync_client/Visual_Tour.html | 2 +-
core/doc/admin/sync_client/index.html | 2 +-
core/doc/admin/web_guide/Adding_Data.html | 2 +-
core/doc/admin/web_guide/Initial_Log_In.html | 2 +-
core/doc/admin/web_guide/Introduction.html | 2 +-
core/doc/admin/web_guide/Main_ownCloud_screen.html | 2 +-
core/doc/admin/web_guide/Navigation.html | 2 +-
.../admin/web_guide/Personal_Configurations.html | 2 +-
core/doc/admin/web_guide/Table_of_Contents.html | 2 +-
core/doc/admin/web_guide/index.html | 2 +-
core/doc/user/_sources/index.txt | 7 +-
core/doc/user/bookmarks.html | 2 +-
core/doc/user/contents.html | 4 +-
core/doc/user/documents.html | 2 +-
core/doc/user/external_storage/google_drive.html | 2 +-
.../user/files/configuring_big_file_upload.html | 2 +-
core/doc/user/files/deletedfiles.html | 2 +-
core/doc/user/files/encryption.html | 2 +-
core/doc/user/files/files.html | 2 +-
core/doc/user/files/filesweb.html | 2 +-
core/doc/user/files/index.html | 2 +-
core/doc/user/files/quota.html | 2 +-
core/doc/user/files/sync.html | 2 +-
core/doc/user/files/versioncontrol.html | 2 +-
core/doc/user/genindex.html | 2 +-
core/doc/user/index.html | 8 +-
core/doc/user/migration.html | 2 +-
core/doc/user/objects.inv | Bin 288 -> 294 bytes
core/doc/user/pim/calendar.html | 2 +-
core/doc/user/pim/contacts.html | 2 +-
core/doc/user/pim/index.html | 2 +-
core/doc/user/pim/sync_ios.html | 5 +-
core/doc/user/pim/sync_kde.html | 2 +-
core/doc/user/pim/sync_osx.html | 2 +-
core/doc/user/pim/sync_thunderbird.html | 2 +-
core/doc/user/pim/troubleshooting.html | 2 +-
core/doc/user/search.html | 2 +-
core/doc/user/userpreferences.html | 2 +-
core/doc/user/webinterface.html | 4 +-
core/img/actions/checkmark-white.png | Bin 0 -> 286 bytes
core/img/actions/checkmark-white.svg | 4 +
core/js/config.php | 9 +-
core/l10n/de.php | 4 +-
core/l10n/de_DE.php | 4 +-
core/skeleton/ownCloudUserManual.pdf | Bin 1571890 -> 1571970 bytes
lib/private/db/mdb2schemamanager.php | 3 +
lib/private/db/mdb2schemareader.php | 2 +
lib/private/defaults.php | 7 ++
lib/private/helper.php | 2 +-
lib/private/user.php | 4 +-
lib/public/share.php | 16 ++-
settings/ajax/decryptall.php | 2 +
settings/js/users.js | 81 +++++++++----
version.php | 8 +-
279 files changed, 1669 insertions(+), 1338 deletions(-)
diff --cc 3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2003XML.php
index fef9837,0000000..fef68be
mode 100644,000000..100644
--- a/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2003XML.php
+++ b/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2003XML.php
@@@ -1,804 -1,0 +1,806 @@@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ * @version 1.7.9, 2013-06-02
+ */
+
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+ /**
+ * @ignore
+ */
+ define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+ require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel2003XML
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+ /**
+ * Formats
+ *
+ * @var array
+ */
+ private $_styles = array();
+
+ /**
+ * Character set used in the file
+ *
+ * @var string
+ */
+ private $_charSet = 'UTF-8';
+
+
+ /**
+ * Create a new PHPExcel_Reader_Excel2003XML
+ */
+ public function __construct() {
+ $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+ }
+
+
+ /**
+ * Can the current PHPExcel_Reader_IReader read the file?
+ *
+ * @param string $pFilename
+ * @return boolean
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function canRead($pFilename)
+ {
+
+ // Office xmlns:o="urn:schemas-microsoft-com:office:office"
+ // Excel xmlns:x="urn:schemas-microsoft-com:office:excel"
+ // XML Spreadsheet xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ // Spreadsheet component xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
+ // XML schema xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
+ // XML data type xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+ // MS-persist recordset xmlns:rs="urn:schemas-microsoft-com:rowset"
+ // Rowset xmlns:z="#RowsetSchema"
+ //
+
+ $signature = array(
+ '<?xml version="1.0"',
+ '<?mso-application progid="Excel.Sheet"?>'
+ );
+
+ // Open file
+ $this->_openFile($pFilename);
+ $fileHandle = $this->_fileHandle;
+
+ // Read sample data (first 2 KB will do)
+ $data = fread($fileHandle, 2048);
+ fclose($fileHandle);
+
+ $valid = true;
+ foreach($signature as $match) {
+ // every part of the signature must be present
+ if (strpos($data, $match) === false) {
+ $valid = false;
+ break;
+ }
+ }
+
+ // Retrieve charset encoding
+ if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
+ $this->_charSet = strtoupper($matches[1]);
+ }
+// echo 'Character Set is ',$this->_charSet,'<br />';
+
+ return $valid;
+ }
+
+
+ /**
+ * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetNames($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+ if (!$this->canRead($pFilename)) {
+ throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+ }
+
+ $worksheetNames = array();
+
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_file($pFilename);
++ libxml_disable_entity_loader($loadEntities);
+ $namespaces = $xml->getNamespaces(true);
+
+ $xml_ss = $xml->children($namespaces['ss']);
+ foreach($xml_ss->Worksheet as $worksheet) {
+ $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+ $worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+ }
+
+ return $worksheetNames;
+ }
+
+
+ /**
+ * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetInfo($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $worksheetInfo = array();
+
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_file($pFilename);
++ libxml_disable_entity_loader($loadEntities);
+ $namespaces = $xml->getNamespaces(true);
+
+ $worksheetID = 1;
+ $xml_ss = $xml->children($namespaces['ss']);
+ foreach($xml_ss->Worksheet as $worksheet) {
+ $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+
+ $tmpInfo = array();
+ $tmpInfo['worksheetName'] = '';
+ $tmpInfo['lastColumnLetter'] = 'A';
+ $tmpInfo['lastColumnIndex'] = 0;
+ $tmpInfo['totalRows'] = 0;
+ $tmpInfo['totalColumns'] = 0;
+
+ if (isset($worksheet_ss['Name'])) {
+ $tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
+ } else {
+ $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
+ }
+
+ if (isset($worksheet->Table->Row)) {
+ $rowIndex = 0;
+
+ foreach($worksheet->Table->Row as $rowData) {
+ $columnIndex = 0;
+ $rowHasData = false;
+
+ foreach($rowData->Cell as $cell) {
+ if (isset($cell->Data)) {
+ $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+ $rowHasData = true;
+ }
+
+ ++$columnIndex;
+ }
+
+ ++$rowIndex;
+
+ if ($rowHasData) {
+ $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+ }
+ }
+ }
+
+ $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+ $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+ $worksheetInfo[] = $tmpInfo;
+ ++$worksheetID;
+ }
+
+ return $worksheetInfo;
+ }
+
+
+ /**
+ * Loads PHPExcel from file
+ *
+ * @param string $pFilename
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function load($pFilename)
+ {
+ // Create new PHPExcel
+ $objPHPExcel = new PHPExcel();
+
+ // Load into this instance
+ return $this->loadIntoExisting($pFilename, $objPHPExcel);
+ }
+
+
+ private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+ $styleAttributeValue = strtolower($styleAttributeValue);
+ foreach($styleList as $style) {
+ if ($styleAttributeValue == strtolower($style)) {
+ $styleAttributeValue = $style;
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * pixel units to excel width units(units of 1/256th of a character width)
+ * @param pxs
+ * @return
+ */
+ private static function _pixel2WidthUnits($pxs) {
+ $UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
+
+ $widthUnits = 256 * ($pxs / 7);
+ $widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
+ return $widthUnits;
+ }
+
+
+ /**
+ * excel width units(units of 1/256th of a character width) to pixel units
+ * @param widthUnits
+ * @return
+ */
+ private static function _widthUnits2Pixel($widthUnits) {
+ $pixels = ($widthUnits / 256) * 7;
+ $offsetWidthUnits = $widthUnits % 256;
+ $pixels += round($offsetWidthUnits / (256 / 7));
+ return $pixels;
+ }
+
+
+ private static function _hex2str($hex) {
+ return chr(hexdec($hex[1]));
+ }
+
+
+ /**
+ * Loads PHPExcel from file into PHPExcel instance
+ *
+ * @param string $pFilename
+ * @param PHPExcel $objPHPExcel
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+ {
+ $fromFormats = array('\-', '\ ');
+ $toFormats = array('-', ' ');
+
+ $underlineStyles = array (
+ PHPExcel_Style_Font::UNDERLINE_NONE,
+ PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+ PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
+ PHPExcel_Style_Font::UNDERLINE_SINGLE,
+ PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
+ );
+ $verticalAlignmentStyles = array (
+ PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
+ PHPExcel_Style_Alignment::VERTICAL_TOP,
+ PHPExcel_Style_Alignment::VERTICAL_CENTER,
+ PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
+ );
+ $horizontalAlignmentStyles = array (
+ PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
+ PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
+ PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
+ PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
+ PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+ PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY
+ );
+
+ $timezoneObj = new DateTimeZone('Europe/London');
+ $GMT = new DateTimeZone('UTC');
+
+
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ if (!$this->canRead($pFilename)) {
+ throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+ }
+
+ $xml = simplexml_load_file($pFilename);
+ $namespaces = $xml->getNamespaces(true);
+
+ $docProps = $objPHPExcel->getProperties();
+ if (isset($xml->DocumentProperties[0])) {
+ foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+ switch ($propertyName) {
+ case 'Title' :
+ $docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Subject' :
+ $docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Author' :
+ $docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Created' :
+ $creationDate = strtotime($propertyValue);
+ $docProps->setCreated($creationDate);
+ break;
+ case 'LastAuthor' :
+ $docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'LastSaved' :
+ $lastSaveDate = strtotime($propertyValue);
+ $docProps->setModified($lastSaveDate);
+ break;
+ case 'Company' :
+ $docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Category' :
+ $docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Manager' :
+ $docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Keywords' :
+ $docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ case 'Description' :
+ $docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
+ break;
+ }
+ }
+ }
+ if (isset($xml->CustomDocumentProperties)) {
+ foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+ $propertyAttributes = $propertyValue->attributes($namespaces['dt']);
+ $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
+ switch((string) $propertyAttributes) {
+ case 'string' :
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+ $propertyValue = trim($propertyValue);
+ break;
+ case 'boolean' :
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+ $propertyValue = (bool) $propertyValue;
+ break;
+ case 'integer' :
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER;
+ $propertyValue = intval($propertyValue);
+ break;
+ case 'float' :
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
+ $propertyValue = floatval($propertyValue);
+ break;
+ case 'dateTime.tz' :
+ $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
+ $propertyValue = strtotime(trim($propertyValue));
+ break;
+ }
+ $docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
+ }
+ }
+
+ foreach($xml->Styles[0] as $style) {
+ $style_ss = $style->attributes($namespaces['ss']);
+ $styleID = (string) $style_ss['ID'];
+// echo 'Style ID = '.$styleID.'<br />';
+ if ($styleID == 'Default') {
+ $this->_styles['Default'] = array();
+ } else {
+ $this->_styles[$styleID] = $this->_styles['Default'];
+ }
+ foreach ($style as $styleType => $styleData) {
+ $styleAttributes = $styleData->attributes($namespaces['ss']);
+// echo $styleType.'<br />';
+ switch ($styleType) {
+ case 'Alignment' :
+ foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+// echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+ $styleAttributeValue = (string) $styleAttributeValue;
+ switch ($styleAttributeKey) {
+ case 'Vertical' :
+ if (self::identifyFixedStyleValue($verticalAlignmentStyles,$styleAttributeValue)) {
+ $this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
+ }
+ break;
+ case 'Horizontal' :
+ if (self::identifyFixedStyleValue($horizontalAlignmentStyles,$styleAttributeValue)) {
+ $this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
+ }
+ break;
+ case 'WrapText' :
+ $this->_styles[$styleID]['alignment']['wrap'] = true;
+ break;
+ }
+ }
+ break;
+ case 'Borders' :
+ foreach($styleData->Border as $borderStyle) {
+ $borderAttributes = $borderStyle->attributes($namespaces['ss']);
+ $thisBorder = array();
+ foreach($borderAttributes as $borderStyleKey => $borderStyleValue) {
+// echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
+ switch ($borderStyleKey) {
+ case 'LineStyle' :
+ $thisBorder['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
+// $thisBorder['style'] = $borderStyleValue;
+ break;
+ case 'Weight' :
+// $thisBorder['style'] = $borderStyleValue;
+ break;
+ case 'Position' :
+ $borderPosition = strtolower($borderStyleValue);
+ break;
+ case 'Color' :
+ $borderColour = substr($borderStyleValue,1);
+ $thisBorder['color']['rgb'] = $borderColour;
+ break;
+ }
+ }
+ if (!empty($thisBorder)) {
+ if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
+ $this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
+ }
+ }
+ }
+ break;
+ case 'Font' :
+ foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+// echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+ $styleAttributeValue = (string) $styleAttributeValue;
+ switch ($styleAttributeKey) {
+ case 'FontName' :
+ $this->_styles[$styleID]['font']['name'] = $styleAttributeValue;
+ break;
+ case 'Size' :
+ $this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
+ break;
+ case 'Color' :
+ $this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
+ break;
+ case 'Bold' :
+ $this->_styles[$styleID]['font']['bold'] = true;
+ break;
+ case 'Italic' :
+ $this->_styles[$styleID]['font']['italic'] = true;
+ break;
+ case 'Underline' :
+ if (self::identifyFixedStyleValue($underlineStyles,$styleAttributeValue)) {
+ $this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
+ }
+ break;
+ }
+ }
+ break;
+ case 'Interior' :
+ foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+// echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+ switch ($styleAttributeKey) {
+ case 'Color' :
+ $this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
+ break;
+ }
+ }
+ break;
+ case 'NumberFormat' :
+ foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+// echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+ $styleAttributeValue = str_replace($fromFormats,$toFormats,$styleAttributeValue);
+ switch ($styleAttributeValue) {
+ case 'Short Date' :
+ $styleAttributeValue = 'dd/mm/yyyy';
+ break;
+ }
+ if ($styleAttributeValue > '') {
+ $this->_styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
+ }
+ }
+ break;
+ case 'Protection' :
+ foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
+// echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
+ }
+ break;
+ }
+ }
+// print_r($this->_styles[$styleID]);
+// echo '<hr />';
+ }
+// echo '<hr />';
+
+ $worksheetID = 0;
+ $xml_ss = $xml->children($namespaces['ss']);
+
+ foreach($xml_ss->Worksheet as $worksheet) {
+ $worksheet_ss = $worksheet->attributes($namespaces['ss']);
+
+ if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
+ (!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
+ continue;
+ }
+
+// echo '<h3>Worksheet: ',$worksheet_ss['Name'],'<h3>';
+//
+ // Create new Worksheet
+ $objPHPExcel->createSheet();
+ $objPHPExcel->setActiveSheetIndex($worksheetID);
+ if (isset($worksheet_ss['Name'])) {
+ $worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+ // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+ // formula cells... during the load, all formulae should be correct, and we're simply bringing
+ // the worksheet name in line with the formula, not the reverse
+ $objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+ }
+
+ $columnID = 'A';
+ if (isset($worksheet->Table->Column)) {
+ foreach($worksheet->Table->Column as $columnData) {
+ $columnData_ss = $columnData->attributes($namespaces['ss']);
+ if (isset($columnData_ss['Index'])) {
+ $columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+ }
+ if (isset($columnData_ss['Width'])) {
+ $columnWidth = $columnData_ss['Width'];
+// echo '<b>Setting column width for '.$columnID.' to '.$columnWidth.'</b><br />';
+ $objPHPExcel->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
+ }
+ ++$columnID;
+ }
+ }
+
+ $rowID = 1;
+ if (isset($worksheet->Table->Row)) {
+ foreach($worksheet->Table->Row as $rowData) {
+ $rowHasData = false;
+ $row_ss = $rowData->attributes($namespaces['ss']);
+ if (isset($row_ss['Index'])) {
+ $rowID = (integer) $row_ss['Index'];
+ }
+// echo '<b>Row '.$rowID.'</b><br />';
+
+ $columnID = 'A';
+ foreach($rowData->Cell as $cell) {
+
+ $cell_ss = $cell->attributes($namespaces['ss']);
+ if (isset($cell_ss['Index'])) {
+ $columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
+ }
+ $cellRange = $columnID.$rowID;
+
+ if ($this->getReadFilter() !== NULL) {
+ if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+ continue;
+ }
+ }
+
+ if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
+ $columnTo = $columnID;
+ if (isset($cell_ss['MergeAcross'])) {
+ $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+ }
+ $rowTo = $rowID;
+ if (isset($cell_ss['MergeDown'])) {
+ $rowTo = $rowTo + $cell_ss['MergeDown'];
+ }
+ $cellRange .= ':'.$columnTo.$rowTo;
+ $objPHPExcel->getActiveSheet()->mergeCells($cellRange);
+ }
+
+ $cellIsSet = $hasCalculatedValue = false;
+ $cellDataFormula = '';
+ if (isset($cell_ss['Formula'])) {
+ $cellDataFormula = $cell_ss['Formula'];
+ // added this as a check for array formulas
+ if (isset($cell_ss['ArrayRange'])) {
+ $cellDataCSEFormula = $cell_ss['ArrayRange'];
+// echo "found an array formula at ".$columnID.$rowID."<br />";
+ }
+ $hasCalculatedValue = true;
+ }
+ if (isset($cell->Data)) {
+ $cellValue = $cellData = $cell->Data;
+ $type = PHPExcel_Cell_DataType::TYPE_NULL;
+ $cellData_ss = $cellData->attributes($namespaces['ss']);
+ if (isset($cellData_ss['Type'])) {
+ $cellDataType = $cellData_ss['Type'];
+ switch ($cellDataType) {
+ /*
+ const TYPE_STRING = 's';
+ const TYPE_FORMULA = 'f';
+ const TYPE_NUMERIC = 'n';
+ const TYPE_BOOL = 'b';
+ const TYPE_NULL = 'null';
+ const TYPE_INLINE = 'inlineStr';
+ const TYPE_ERROR = 'e';
+ */
+ case 'String' :
+ $cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
+ $type = PHPExcel_Cell_DataType::TYPE_STRING;
+ break;
+ case 'Number' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $cellValue = (float) $cellValue;
+ if (floor($cellValue) == $cellValue) {
+ $cellValue = (integer) $cellValue;
+ }
+ break;
+ case 'Boolean' :
+ $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+ $cellValue = ($cellValue != 0);
+ break;
+ case 'DateTime' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $cellValue = PHPExcel_Shared_Date::PHPToExcel(strtotime($cellValue));
+ break;
+ case 'Error' :
+ $type = PHPExcel_Cell_DataType::TYPE_ERROR;
+ break;
+ }
+ }
+
+ if ($hasCalculatedValue) {
+// echo 'FORMULA<br />';
+ $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+ $columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
+ if (substr($cellDataFormula,0,3) == 'of:') {
+ $cellDataFormula = substr($cellDataFormula,3);
+// echo 'Before: ',$cellDataFormula,'<br />';
+ $temp = explode('"',$cellDataFormula);
+ $key = false;
+ foreach($temp as &$value) {
+ // Only replace in alternate array entries (i.e. non-quoted blocks)
+ if ($key = !$key) {
+ $value = str_replace(array('[.','.',']'),'',$value);
+ }
+ }
+ } else {
+ // Convert R1C1 style references to A1 style references (but only when not quoted)
+// echo 'Before: ',$cellDataFormula,'<br />';
+ $temp = explode('"',$cellDataFormula);
+ $key = false;
+ foreach($temp as &$value) {
+ // Only replace in alternate array entries (i.e. non-quoted blocks)
+ if ($key = !$key) {
+ preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+ // Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+ // through the formula from left to right. Reversing means that we work right to left.through
+ // the formula
+ $cellReferences = array_reverse($cellReferences);
+ // Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+ // then modify the formula to use that new reference
+ foreach($cellReferences as $cellReference) {
+ $rowReference = $cellReference[2][0];
+ // Empty R reference is the current row
+ if ($rowReference == '') $rowReference = $rowID;
+ // Bracketed R references are relative to the current row
+ if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+ $columnReference = $cellReference[4][0];
+ // Empty C reference is the current column
+ if ($columnReference == '') $columnReference = $columnNumber;
+ // Bracketed C references are relative to the current column
+ if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
+ $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+ $value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
+ }
+ }
+ }
+ }
+ unset($value);
+ // Then rebuild the formula string
+ $cellDataFormula = implode('"',$temp);
+// echo 'After: ',$cellDataFormula,'<br />';
+ }
+
+// echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
+//
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue),$type);
+ if ($hasCalculatedValue) {
+// echo 'Formula result is '.$cellValue.'<br />';
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
+ }
+ $cellIsSet = $rowHasData = true;
+ }
+
+ if (isset($cell->Comment)) {
+// echo '<b>comment found</b><br />';
+ $commentAttributes = $cell->Comment->attributes($namespaces['ss']);
+ $author = 'unknown';
+ if (isset($commentAttributes->Author)) {
+ $author = (string)$commentAttributes->Author;
+// echo 'Author: ',$author,'<br />';
+ }
+ $node = $cell->Comment->Data->asXML();
+// $annotation = str_replace('html:','',substr($node,49,-10));
+// echo $annotation,'<br />';
+ $annotation = strip_tags($node);
+// echo 'Annotation: ',$annotation,'<br />';
+ $objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
+ ->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
+ ->setText($this->_parseRichText($annotation) );
+ }
+
+ if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
+ $style = (string) $cell_ss['StyleID'];
+// echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
+ if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
+// echo 'Cell '.$columnID.$rowID.'<br />';
+// print_r($this->_styles[$style]);
+// echo '<br />';
+ if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
+ }
+ $objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
+ }
+ }
+ ++$columnID;
+ }
+
+ if ($rowHasData) {
+ if (isset($row_ss['StyleID'])) {
+ $rowStyle = $row_ss['StyleID'];
+ }
+ if (isset($row_ss['Height'])) {
+ $rowHeight = $row_ss['Height'];
+// echo '<b>Setting row height to '.$rowHeight.'</b><br />';
+ $objPHPExcel->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
+ }
+ }
+
+ ++$rowID;
+ }
+ }
+ ++$worksheetID;
+ }
+
+ // Return
+ return $objPHPExcel;
+ }
+
+
+ private static function _convertStringEncoding($string,$charset) {
+ if ($charset != 'UTF-8') {
+ return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
+ }
+ return $string;
+ }
+
+
+ private function _parseRichText($is = '') {
+ $value = new PHPExcel_RichText();
+
+ $value->createText(self::_convertStringEncoding($is,$this->_charSet));
+
+ return $value;
+ }
+
+}
diff --cc 3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2007.php
index 932fb1e,0000000..2d86078
mode 100644,000000..100644
--- a/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2007.php
+++ b/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Excel2007.php
@@@ -1,1996 -1,0 +1,2015 @@@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ * @version 1.7.9, 2013-06-02
+ */
+
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+ /**
+ * @ignore
+ */
+ define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+ require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel2007
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+ /**
+ * PHPExcel_ReferenceHelper instance
+ *
+ * @var PHPExcel_ReferenceHelper
+ */
+ private $_referenceHelper = NULL;
+
+ /**
+ * PHPExcel_Reader_Excel2007_Theme instance
+ *
+ * @var PHPExcel_Reader_Excel2007_Theme
+ */
+ private static $_theme = NULL;
+
+
+ /**
+ * Create a new PHPExcel_Reader_Excel2007 instance
+ */
+ public function __construct() {
+ $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+ $this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ }
+
+
+ /**
+ * Can the current PHPExcel_Reader_IReader read the file?
+ *
+ * @param string $pFilename
+ * @return boolean
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function canRead($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ // Check if zip class exists
+ if (!class_exists('ZipArchive',FALSE)) {
+ throw new PHPExcel_Reader_Exception("ZipArchive library is not enabled");
+ }
+
+ $xl = false;
+ // Load file
+ $zip = new ZipArchive;
+ if ($zip->open($pFilename) === true) {
+ // check if it is an OOXML archive
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"));
++ libxml_disable_entity_loader($loadEntities);
+ if ($rels !== false) {
+ foreach ($rels->Relationship as $rel) {
+ switch ($rel["Type"]) {
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+ if (basename($rel["Target"]) == 'workbook.xml') {
+ $xl = true;
+ }
+ break;
+
+ }
+ }
+ }
+ $zip->close();
+ }
+
+ return $xl;
+ }
+
+
+ /**
+ * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetNames($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $worksheetNames = array();
+
+ $zip = new ZipArchive;
+ $zip->open($pFilename);
+
+ // The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $rels = simplexml_load_string(
+ $this->_getFromZipArchive($zip, "_rels/.rels")
+ ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($rels->Relationship as $rel) {
+ switch ($rel["Type"]) {
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlWorkbook = simplexml_load_string(
+ $this->_getFromZipArchive($zip, "{$rel['Target']}")
+ ); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+
+ if ($xmlWorkbook->sheets) {
+ foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+ // Check if sheet should be skipped
+ $worksheetNames[] = (string) $eleSheet["name"];
+ }
+ }
+ }
+ }
+
+ $zip->close();
+
+ return $worksheetNames;
+ }
+
+
+ /**
+ * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetInfo($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $worksheetInfo = array();
+
+ $zip = new ZipArchive;
+ $zip->open($pFilename);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($rels->Relationship as $rel) {
+ if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
+ $dir = dirname($rel["Target"]);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ $relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+
+ $worksheets = array();
+ foreach ($relsWorkbook->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
+ $worksheets[(string) $ele["Id"]] = $ele["Target"];
+ }
+ }
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+ if ($xmlWorkbook->sheets) {
+ $dir = dirname($rel["Target"]);
+ foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+ $tmpInfo = array(
+ 'worksheetName' => (string) $eleSheet["name"],
+ 'lastColumnLetter' => 'A',
+ 'lastColumnIndex' => 0,
+ 'totalRows' => 0,
+ 'totalColumns' => 0,
+ );
+
+ $fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+
+ $xml = new XMLReader();
+ $res = $xml->open('zip://'.PHPExcel_Shared_File::realpath($pFilename).'#'."$dir/$fileWorksheet");
+ $xml->setParserProperty(2,true);
+
+ $currCells = 0;
+ while ($xml->read()) {
+ if ($xml->name == 'row' && $xml->nodeType == XMLReader::ELEMENT) {
+ $row = $xml->getAttribute('r');
+ $tmpInfo['totalRows'] = $row;
+ $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
+ $currCells = 0;
+ } elseif ($xml->name == 'c' && $xml->nodeType == XMLReader::ELEMENT) {
+ $currCells++;
+ }
+ }
+ $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
+ $xml->close();
+
+ $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+ $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+
+ $worksheetInfo[] = $tmpInfo;
+ }
+ }
+ }
+ }
+
+ $zip->close();
+
+ return $worksheetInfo;
+ }
+
+
+ private static function _castToBool($c) {
+// echo 'Initial Cast to Boolean<br />';
+ $value = isset($c->v) ? (string) $c->v : NULL;
+ if ($value == '0') {
+ return FALSE;
+ } elseif ($value == '1') {
+ return TRUE;
+ } else {
+ return (bool)$c->v;
+ }
+ return $value;
+ } // function _castToBool()
+
+
+ private static function _castToError($c) {
+// echo 'Initial Cast to Error<br />';
+ return isset($c->v) ? (string) $c->v : NULL;
+ } // function _castToError()
+
+
+ private static function _castToString($c) {
+// echo 'Initial Cast to String<br />';
+ return isset($c->v) ? (string) $c->v : NULL;
+ } // function _castToString()
+
+
+ private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
+// echo 'Formula<br />';
+// echo '$c->f is '.$c->f.'<br />';
+ $cellDataType = 'f';
+ $value = "={$c->f}";
+ $calculatedValue = self::$castBaseType($c);
+
+ // Shared formula?
+ if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
+// echo 'SHARED FORMULA<br />';
+ $instance = (string)$c->f['si'];
+
+// echo 'Instance ID = '.$instance.'<br />';
+//
+// echo 'Shared Formula Array:<pre>';
+// print_r($sharedFormulas);
+// echo '</pre>';
+ if (!isset($sharedFormulas[(string)$c->f['si']])) {
+// echo 'SETTING NEW SHARED FORMULA<br />';
+// echo 'Master is '.$r.'<br />';
+// echo 'Formula is '.$value.'<br />';
+ $sharedFormulas[$instance] = array( 'master' => $r,
+ 'formula' => $value
+ );
+// echo 'New Shared Formula Array:<pre>';
+// print_r($sharedFormulas);
+// echo '</pre>';
+ } else {
+// echo 'GETTING SHARED FORMULA<br />';
+// echo 'Master is '.$sharedFormulas[$instance]['master'].'<br />';
+// echo 'Formula is '.$sharedFormulas[$instance]['formula'].'<br />';
+ $master = PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
+ $current = PHPExcel_Cell::coordinateFromString($r);
+
+ $difference = array(0, 0);
+ $difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
+ $difference[1] = $current[1] - $master[1];
+
+ $value = $this->_referenceHelper->updateFormulaReferences( $sharedFormulas[$instance]['formula'],
+ 'A1',
+ $difference[0],
+ $difference[1]
+ );
+// echo 'Adjusted Formula is '.$value.'<br />';
+ }
+ }
+ }
+
+
+ public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
+ {
+ // Root-relative paths
+ if (strpos($fileName, '//') !== false)
+ {
+ $fileName = substr($fileName, strpos($fileName, '//') + 1);
+ }
+ $fileName = PHPExcel_Shared_File::realpath($fileName);
+
+ // Apache POI fixes
+ $contents = $archive->getFromName($fileName);
+ if ($contents === false)
+ {
+ $contents = $archive->getFromName(substr($fileName, 1));
+ }
+
+ return $contents;
+ }
+
+
+ /**
+ * Loads PHPExcel from file
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function load($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ // Initialisations
+ $excel = new PHPExcel;
+ $excel->removeSheetByIndex(0);
+ if (!$this->_readDataOnly) {
+ $excel->removeCellStyleXfByIndex(0); // remove the default style
+ $excel->removeCellXfByIndex(0); // remove the default style
+ }
+ $zip = new ZipArchive;
+ $zip->open($pFilename);
+
+ // Read the theme first, because we need the colour scheme when reading the styles
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $wbRels = simplexml_load_string($this->_getFromZipArchive($zip, "xl/_rels/workbook.xml.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($wbRels->Relationship as $rel) {
+ switch ($rel["Type"]) {
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
+ $themeOrderArray = array('lt1','dk1','lt2','dk2');
+ $themeOrderAdditional = count($themeOrderArray);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlTheme = simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"));
++ libxml_disable_entity_loader($loadEntities);
+ if (is_object($xmlTheme)) {
+ $xmlThemeName = $xmlTheme->attributes();
+ $xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
+ $themeName = (string)$xmlThemeName['name'];
+
+ $colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
+ $colourSchemeName = (string)$colourScheme['name'];
+ $colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
+
+ $themeColours = array();
+ foreach ($colourScheme as $k => $xmlColour) {
+ $themePos = array_search($k,$themeOrderArray);
+ if ($themePos === false) {
+ $themePos = $themeOrderAdditional++;
+ }
+ if (isset($xmlColour->sysClr)) {
+ $xmlColourData = $xmlColour->sysClr->attributes();
+ $themeColours[$themePos] = $xmlColourData['lastClr'];
+ } elseif (isset($xmlColour->srgbClr)) {
+ $xmlColourData = $xmlColour->srgbClr->attributes();
+ $themeColours[$themePos] = $xmlColourData['val'];
+ }
+ }
+ self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName,$colourSchemeName,$themeColours);
+ }
+ break;
+ }
+ }
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($rels->Relationship as $rel) {
+ switch ($rel["Type"]) {
+ case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties":
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
++ libxml_disable_entity_loader($loadEntities);
+ if (is_object($xmlCore)) {
+ $xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/");
+ $xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/");
+ $xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+ $docProps = $excel->getProperties();
+ $docProps->setCreator((string) self::array_item($xmlCore->xpath("dc:creator")));
+ $docProps->setLastModifiedBy((string) self::array_item($xmlCore->xpath("cp:lastModifiedBy")));
+ $docProps->setCreated(strtotime(self::array_item($xmlCore->xpath("dcterms:created")))); //! respect xsi:type
+ $docProps->setModified(strtotime(self::array_item($xmlCore->xpath("dcterms:modified")))); //! respect xsi:type
+ $docProps->setTitle((string) self::array_item($xmlCore->xpath("dc:title")));
+ $docProps->setDescription((string) self::array_item($xmlCore->xpath("dc:description")));
+ $docProps->setSubject((string) self::array_item($xmlCore->xpath("dc:subject")));
+ $docProps->setKeywords((string) self::array_item($xmlCore->xpath("cp:keywords")));
+ $docProps->setCategory((string) self::array_item($xmlCore->xpath("cp:category")));
+ }
+ break;
+
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties":
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
++ libxml_disable_entity_loader($loadEntities);
+ if (is_object($xmlCore)) {
+ $docProps = $excel->getProperties();
+ if (isset($xmlCore->Company))
+ $docProps->setCompany((string) $xmlCore->Company);
+ if (isset($xmlCore->Manager))
+ $docProps->setManager((string) $xmlCore->Manager);
+ }
+ break;
+
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties":
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
++ libxml_disable_entity_loader($loadEntities);
+ if (is_object($xmlCore)) {
+ $docProps = $excel->getProperties();
+ foreach ($xmlCore as $xmlProperty) {
+ $cellDataOfficeAttributes = $xmlProperty->attributes();
+ if (isset($cellDataOfficeAttributes['name'])) {
+ $propertyName = (string) $cellDataOfficeAttributes['name'];
+ $cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
+ $attributeType = $cellDataOfficeChildren->getName();
+ $attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
+ $attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue,$attributeType);
+ $attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
+ $docProps->setCustomProperty($propertyName,$attributeValue,$attributeType);
+ }
+ }
+ }
+ break;
+
+ case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+ $dir = dirname($rel["Target"]);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ $relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+
+ $sharedStrings = array();
+ $xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+ if (isset($xmlStrings) && isset($xmlStrings->si)) {
+ foreach ($xmlStrings->si as $val) {
+ if (isset($val->t)) {
+ $sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $val->t );
+ } elseif (isset($val->r)) {
+ $sharedStrings[] = $this->_parseRichText($val);
+ }
+ }
+ }
+
+ $worksheets = array();
+ foreach ($relsWorkbook->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
+ $worksheets[(string) $ele["Id"]] = $ele["Target"];
+ }
+ }
+
+ $styles = array();
+ $cellStyles = array();
+ $xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlStyles = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+ $numFmts = null;
+ if ($xmlStyles && $xmlStyles->numFmts[0]) {
+ $numFmts = $xmlStyles->numFmts[0];
+ }
+ if (isset($numFmts) && ($numFmts !== NULL)) {
+ $numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+ }
+ if (!$this->_readDataOnly && $xmlStyles) {
+ foreach ($xmlStyles->cellXfs->xf as $xf) {
+ $numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+
+ if ($xf["numFmtId"]) {
+ if (isset($numFmts)) {
+ $tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+
+ if (isset($tmpNumFmt["formatCode"])) {
+ $numFmt = (string) $tmpNumFmt["formatCode"];
+ }
+ }
+
+ if ((int)$xf["numFmtId"] < 164) {
+ $numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+ }
+ }
+ //$numFmt = str_replace('mm', 'i', $numFmt);
+ //$numFmt = str_replace('h', 'H', $numFmt);
+
+ $style = (object) array(
+ "numFmt" => $numFmt,
+ "font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
+ "fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
+ "border" => $xmlStyles->borders->border[intval($xf["borderId"])],
+ "alignment" => $xf->alignment,
+ "protection" => $xf->protection,
+ );
+ $styles[] = $style;
+
+ // add style to cellXf collection
+ $objStyle = new PHPExcel_Style;
+ self::_readStyle($objStyle, $style);
+ $excel->addCellXf($objStyle);
+ }
+
+ foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
+ $numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+ if ($numFmts && $xf["numFmtId"]) {
+ $tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
+ if (isset($tmpNumFmt["formatCode"])) {
+ $numFmt = (string) $tmpNumFmt["formatCode"];
+ } else if ((int)$xf["numFmtId"] < 165) {
+ $numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
+ }
+ }
+
+ $cellStyle = (object) array(
+ "numFmt" => $numFmt,
+ "font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
+ "fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
+ "border" => $xmlStyles->borders->border[intval($xf["borderId"])],
+ "alignment" => $xf->alignment,
+ "protection" => $xf->protection,
+ );
+ $cellStyles[] = $cellStyle;
+
+ // add style to cellStyleXf collection
+ $objStyle = new PHPExcel_Style;
+ self::_readStyle($objStyle, $cellStyle);
+ $excel->addCellStyleXf($objStyle);
+ }
+ }
+
+ $dxfs = array();
+ if (!$this->_readDataOnly && $xmlStyles) {
+ // Conditional Styles
+ if ($xmlStyles->dxfs) {
+ foreach ($xmlStyles->dxfs->dxf as $dxf) {
+ $style = new PHPExcel_Style(FALSE, TRUE);
+ self::_readStyle($style, $dxf);
+ $dxfs[] = $style;
+ }
+ }
+ // Cell Styles
+ if ($xmlStyles->cellStyles) {
+ foreach ($xmlStyles->cellStyles->cellStyle as $cellStyle) {
+ if (intval($cellStyle['builtinId']) == 0) {
+ if (isset($cellStyles[intval($cellStyle['xfId'])])) {
+ // Set default style
+ $style = new PHPExcel_Style;
+ self::_readStyle($style, $cellStyles[intval($cellStyle['xfId'])]);
+
+ // normal style, currently not using it for anything
+ }
+ }
+ }
+ }
+ }
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+
+ // Set base date
+ if ($xmlWorkbook->workbookPr) {
+ PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
+ if (isset($xmlWorkbook->workbookPr['date1904'])) {
+ if (self::boolean((string) $xmlWorkbook->workbookPr['date1904'])) {
+ PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
+ }
+ }
+ }
+
+ $sheetId = 0; // keep track of new sheet id in final workbook
+ $oldSheetId = -1; // keep track of old sheet id in final workbook
+ $countSkippedSheets = 0; // keep track of number of skipped sheets
+ $mapSheetId = array(); // mapping of sheet ids from old to new
+
+
+ $charts = $chartDetails = array();
+
+ if ($xmlWorkbook->sheets) {
+ foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+ ++$oldSheetId;
+
+ // Check if sheet should be skipped
+ if (isset($this->_loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
+ ++$countSkippedSheets;
+ $mapSheetId[$oldSheetId] = null;
+ continue;
+ }
+
+ // Map old sheet id in original workbook to new sheet id.
+ // They will differ if loadSheetsOnly() is being used
+ $mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
+
+ // Load sheet
+ $docSheet = $excel->createSheet();
+ // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
+ // references in formula cells... during the load, all formulae should be correct,
+ // and we're simply bringing the worksheet name in line with the formula, not the
+ // reverse
+ $docSheet->setTitle((string) $eleSheet["name"],false);
+ $fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
++ libxml_disable_entity_loader($loadEntities);
+
+ $sharedFormulas = array();
+
+ if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
+ $docSheet->setSheetState( (string) $eleSheet["state"] );
+ }
+
+ if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
+ if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
+ $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
+ $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView['view'])) {
+ $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
+ $docSheet->setShowGridLines(self::boolean((string)$xmlSheet->sheetViews->sheetView['showGridLines']));
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
+ $docSheet->setShowRowColHeaders(self::boolean((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders']));
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
+ $docSheet->setRightToLeft(self::boolean((string)$xmlSheet->sheetViews->sheetView['rightToLeft']));
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView->pane)) {
+ if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
+ $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
+ } else {
+ $xSplit = 0;
+ $ySplit = 0;
+
+ if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
+ $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
+ $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
+ }
+
+ $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
+ }
+ }
+
+ if (isset($xmlSheet->sheetViews->sheetView->selection)) {
+ if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
+ $sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
+ $sqref = explode(' ', $sqref);
+ $sqref = $sqref[0];
+ $docSheet->setSelectedCells($sqref);
+ }
+ }
+
+ }
+
+ if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
+ if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
+ $docSheet->getTabColor()->setARGB( (string)$xmlSheet->sheetPr->tabColor['rgb'] );
+ }
+ }
+
+ if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->outlinePr)) {
+ if (isset($xmlSheet->sheetPr->outlinePr['summaryRight']) &&
+ !self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryRight'])) {
+ $docSheet->setShowSummaryRight(FALSE);
+ } else {
+ $docSheet->setShowSummaryRight(TRUE);
+ }
+
+ if (isset($xmlSheet->sheetPr->outlinePr['summaryBelow']) &&
+ !self::boolean((string) $xmlSheet->sheetPr->outlinePr['summaryBelow'])) {
+ $docSheet->setShowSummaryBelow(FALSE);
+ } else {
+ $docSheet->setShowSummaryBelow(TRUE);
+ }
+ }
+
+ if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->pageSetUpPr)) {
+ if (isset($xmlSheet->sheetPr->pageSetUpPr['fitToPage']) &&
+ !self::boolean((string) $xmlSheet->sheetPr->pageSetUpPr['fitToPage'])) {
+ $docSheet->getPageSetup()->setFitToPage(FALSE);
+ } else {
+ $docSheet->getPageSetup()->setFitToPage(TRUE);
+ }
+ }
+
+ if (isset($xmlSheet->sheetFormatPr)) {
+ if (isset($xmlSheet->sheetFormatPr['customHeight']) &&
+ self::boolean((string) $xmlSheet->sheetFormatPr['customHeight']) &&
+ isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
+ $docSheet->getDefaultRowDimension()->setRowHeight( (float)$xmlSheet->sheetFormatPr['defaultRowHeight'] );
+ }
+ if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
+ $docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
+ }
+ if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
+ ((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
+ $docSheet->getDefaultRowDimension()->setzeroHeight(true);
+ }
+ }
+
+ if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
+ foreach ($xmlSheet->cols->col as $col) {
+ for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
+ if ($col["style"] && !$this->_readDataOnly) {
+ $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
+ }
+ if (self::boolean($col["bestFit"])) {
+ //$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setAutoSize(TRUE);
+ }
+ if (self::boolean($col["hidden"])) {
+ $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setVisible(FALSE);
+ }
+ if (self::boolean($col["collapsed"])) {
+ $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setCollapsed(TRUE);
+ }
+ if ($col["outlineLevel"] > 0) {
+ $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setOutlineLevel(intval($col["outlineLevel"]));
+ }
+ $docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setWidth(floatval($col["width"]));
+
+ if (intval($col["max"]) == 16384) {
+ break;
+ }
+ }
+ }
+ }
+
+ if (isset($xmlSheet->printOptions) && !$this->_readDataOnly) {
+ if (self::boolean((string) $xmlSheet->printOptions['gridLinesSet'])) {
+ $docSheet->setShowGridlines(TRUE);
+ }
+
+ if (self::boolean((string) $xmlSheet->printOptions['gridLines'])) {
+ $docSheet->setPrintGridlines(TRUE);
+ }
+
+ if (self::boolean((string) $xmlSheet->printOptions['horizontalCentered'])) {
+ $docSheet->getPageSetup()->setHorizontalCentered(TRUE);
+ }
+ if (self::boolean((string) $xmlSheet->printOptions['verticalCentered'])) {
+ $docSheet->getPageSetup()->setVerticalCentered(TRUE);
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
+ foreach ($xmlSheet->sheetData->row as $row) {
+ if ($row["ht"] && !$this->_readDataOnly) {
+ $docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
+ }
+ if (self::boolean($row["hidden"]) && !$this->_readDataOnly) {
+ $docSheet->getRowDimension(intval($row["r"]))->setVisible(FALSE);
+ }
+ if (self::boolean($row["collapsed"])) {
+ $docSheet->getRowDimension(intval($row["r"]))->setCollapsed(TRUE);
+ }
+ if ($row["outlineLevel"] > 0) {
+ $docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
+ }
+ if ($row["s"] && !$this->_readDataOnly) {
+ $docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
+ }
+
+ foreach ($row->c as $c) {
+ $r = (string) $c["r"];
+ $cellDataType = (string) $c["t"];
+ $value = null;
+ $calculatedValue = null;
+
+ // Read cell?
+ if ($this->getReadFilter() !== NULL) {
+ $coordinates = PHPExcel_Cell::coordinateFromString($r);
+
+ if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
+ continue;
+ }
+ }
+
+ // echo '<b>Reading cell '.$coordinates[0].$coordinates[1].'</b><br />';
+ // print_r($c);
+ // echo '<br />';
+ // echo 'Cell Data Type is '.$cellDataType.': ';
+ //
+ // Read cell!
+ switch ($cellDataType) {
+ case "s":
+ // echo 'String<br />';
+ if ((string)$c->v != '') {
+ $value = $sharedStrings[intval($c->v)];
+
+ if ($value instanceof PHPExcel_RichText) {
+ $value = clone $value;
+ }
+ } else {
+ $value = '';
+ }
+
+ break;
+ case "b":
+ // echo 'Boolean<br />';
+ if (!isset($c->f)) {
+ $value = self::_castToBool($c);
+ } else {
+ // Formula
+ $this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool');
+ if (isset($c->f['t'])) {
+ $att = array();
+ $att = $c->f;
+ $docSheet->getCell($r)->setFormulaAttributes($att);
+ }
+ // echo '$calculatedValue = '.$calculatedValue.'<br />';
+ }
+ break;
+ case "inlineStr":
+ // echo 'Inline String<br />';
+ $value = $this->_parseRichText($c->is);
+
+ break;
+ case "e":
+ // echo 'Error<br />';
+ if (!isset($c->f)) {
+ $value = self::_castToError($c);
+ } else {
+ // Formula
+ $this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToError');
+ // echo '$calculatedValue = '.$calculatedValue.'<br />';
+ }
+
+ break;
+
+ default:
+ // echo 'Default<br />';
+ if (!isset($c->f)) {
+ // echo 'Not a Formula<br />';
+ $value = self::_castToString($c);
+ } else {
+ // echo 'Treat as Formula<br />';
+ // Formula
+ $this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToString');
+ // echo '$calculatedValue = '.$calculatedValue.'<br />';
+ }
+
+ break;
+ }
+ // echo 'Value is '.$value.'<br />';
+
+ // Check for numeric values
+ if (is_numeric($value) && $cellDataType != 's') {
+ if ($value == (int)$value) $value = (int)$value;
+ elseif ($value == (float)$value) $value = (float)$value;
+ elseif ($value == (double)$value) $value = (double)$value;
+ }
+
+ // Rich text?
+ if ($value instanceof PHPExcel_RichText && $this->_readDataOnly) {
+ $value = $value->getPlainText();
+ }
+
+ $cell = $docSheet->getCell($r);
+ // Assign value
+ if ($cellDataType != '') {
+ $cell->setValueExplicit($value, $cellDataType);
+ } else {
+ $cell->setValue($value);
+ }
+ if ($calculatedValue !== NULL) {
+ $cell->setCalculatedValue($calculatedValue);
+ }
+
+ // Style information?
+ if ($c["s"] && !$this->_readDataOnly) {
+ // no style index means 0, it seems
+ $cell->setXfIndex(isset($styles[intval($c["s"])]) ?
+ intval($c["s"]) : 0);
+ }
+ }
+ }
+ }
+
+ $conditionals = array();
+ if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
+ foreach ($xmlSheet->conditionalFormatting as $conditional) {
+ foreach ($conditional->cfRule as $cfRule) {
+ if (
+ (
+ (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
+ (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
+ (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
+ (string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+ ) && isset($dxfs[intval($cfRule["dxfId"])])
+ ) {
+ $conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
+ }
+ }
+ }
+
+ foreach ($conditionals as $ref => $cfRules) {
+ ksort($cfRules);
+ $conditionalStyles = array();
+ foreach ($cfRules as $cfRule) {
+ $objConditional = new PHPExcel_Style_Conditional();
+ $objConditional->setConditionType((string)$cfRule["type"]);
+ $objConditional->setOperatorType((string)$cfRule["operator"]);
+
+ if ((string)$cfRule["text"] != '') {
+ $objConditional->setText((string)$cfRule["text"]);
+ }
+
+ if (count($cfRule->formula) > 1) {
+ foreach ($cfRule->formula as $formula) {
+ $objConditional->addCondition((string)$formula);
+ }
+ } else {
+ $objConditional->addCondition((string)$cfRule->formula);
+ }
+ $objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
+ $conditionalStyles[] = $objConditional;
+ }
+
+ // Extract all cell references in $ref
+ $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($ref);
+ foreach ($aReferences as $reference) {
+ $docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles);
+ }
+ }
+ }
+
+ $aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
+ if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+ foreach ($aKeys as $key) {
+ $method = "set" . ucfirst($key);
+ $docSheet->getProtection()->$method(self::boolean((string) $xmlSheet->sheetProtection[$key]));
+ }
+ }
+
+ if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
+ $docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], TRUE);
+ if ($xmlSheet->protectedRanges->protectedRange) {
+ foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
+ $docSheet->protectCells((string) $protectedRange["sqref"], (string) $protectedRange["password"], true);
+ }
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
+ $autoFilter = $docSheet->getAutoFilter();
+ $autoFilter->setRange((string) $xmlSheet->autoFilter["ref"]);
+ foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
+ $column = $autoFilter->getColumnByOffset((integer) $filterColumn["colId"]);
+ // Check for standard filters
+ if ($filterColumn->filters) {
+ $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER);
+ $filters = $filterColumn->filters;
+ if ((isset($filters["blank"])) && ($filters["blank"] == 1)) {
+ $column->createRule()->setRule(
+ NULL, // Operator is undefined, but always treated as EQUAL
+ ''
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+ }
+ // Standard filters are always an OR join, so no join rule needs to be set
+ // Entries can be either filter elements
+ foreach ($filters->filter as $filterRule) {
+ $column->createRule()->setRule(
+ NULL, // Operator is undefined, but always treated as EQUAL
+ (string) $filterRule["val"]
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+ }
+ // Or Date Group elements
+ foreach ($filters->dateGroupItem as $dateGroupItem) {
+ $column->createRule()->setRule(
+ NULL, // Operator is undefined, but always treated as EQUAL
+ array(
+ 'year' => (string) $dateGroupItem["year"],
+ 'month' => (string) $dateGroupItem["month"],
+ 'day' => (string) $dateGroupItem["day"],
+ 'hour' => (string) $dateGroupItem["hour"],
+ 'minute' => (string) $dateGroupItem["minute"],
+ 'second' => (string) $dateGroupItem["second"],
+ ),
+ (string) $dateGroupItem["dateTimeGrouping"]
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+ }
+ }
+ // Check for custom filters
+ if ($filterColumn->customFilters) {
+ $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
+ $customFilters = $filterColumn->customFilters;
+ // Custom filters can an AND or an OR join;
+ // and there should only ever be one or two entries
+ if ((isset($customFilters["and"])) && ($customFilters["and"] == 1)) {
+ $column->setJoin(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+ }
+ foreach ($customFilters->customFilter as $filterRule) {
+ $column->createRule()->setRule(
+ (string) $filterRule["operator"],
+ (string) $filterRule["val"]
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+ }
+ }
+ // Check for dynamic filters
+ if ($filterColumn->dynamicFilter) {
+ $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
+ // We should only ever have one dynamic filter
+ foreach ($filterColumn->dynamicFilter as $filterRule) {
+ $column->createRule()->setRule(
+ NULL, // Operator is undefined, but always treated as EQUAL
+ (string) $filterRule["val"],
+ (string) $filterRule["type"]
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
+ if (isset($filterRule["val"])) {
+ $column->setAttribute('val',(string) $filterRule["val"]);
+ }
+ if (isset($filterRule["maxVal"])) {
+ $column->setAttribute('maxVal',(string) $filterRule["maxVal"]);
+ }
+ }
+ }
+ // Check for dynamic filters
+ if ($filterColumn->top10) {
+ $column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
+ // We should only ever have one top10 filter
+ foreach ($filterColumn->top10 as $filterRule) {
+ $column->createRule()->setRule(
+ (((isset($filterRule["percent"])) && ($filterRule["percent"] == 1))
+ ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
+ : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
+ ),
+ (string) $filterRule["val"],
+ (((isset($filterRule["top"])) && ($filterRule["top"] == 1))
+ ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
+ : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
+ )
+ )
+ ->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
+ }
+ }
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
+ foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
+ $mergeRef = (string) $mergeCell["ref"];
+ if (strpos($mergeRef,':') !== FALSE) {
+ $docSheet->mergeCells((string) $mergeCell["ref"]);
+ }
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->pageMargins && !$this->_readDataOnly) {
+ $docPageMargins = $docSheet->getPageMargins();
+ $docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
+ $docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
+ $docPageMargins->setTop(floatval($xmlSheet->pageMargins["top"]));
+ $docPageMargins->setBottom(floatval($xmlSheet->pageMargins["bottom"]));
+ $docPageMargins->setHeader(floatval($xmlSheet->pageMargins["header"]));
+ $docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
+ }
+
+ if ($xmlSheet && $xmlSheet->pageSetup && !$this->_readDataOnly) {
+ $docPageSetup = $docSheet->getPageSetup();
+
+ if (isset($xmlSheet->pageSetup["orientation"])) {
+ $docPageSetup->setOrientation((string) $xmlSheet->pageSetup["orientation"]);
+ }
+ if (isset($xmlSheet->pageSetup["paperSize"])) {
+ $docPageSetup->setPaperSize(intval($xmlSheet->pageSetup["paperSize"]));
+ }
+ if (isset($xmlSheet->pageSetup["scale"])) {
+ $docPageSetup->setScale(intval($xmlSheet->pageSetup["scale"]), FALSE);
+ }
+ if (isset($xmlSheet->pageSetup["fitToHeight"]) && intval($xmlSheet->pageSetup["fitToHeight"]) >= 0) {
+ $docPageSetup->setFitToHeight(intval($xmlSheet->pageSetup["fitToHeight"]), FALSE);
+ }
+ if (isset($xmlSheet->pageSetup["fitToWidth"]) && intval($xmlSheet->pageSetup["fitToWidth"]) >= 0) {
+ $docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), FALSE);
+ }
+ if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
+ self::boolean((string) $xmlSheet->pageSetup["useFirstPageNumber"])) {
+ $docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->headerFooter && !$this->_readDataOnly) {
+ $docHeaderFooter = $docSheet->getHeaderFooter();
+
+ if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
+ self::boolean((string)$xmlSheet->headerFooter["differentOddEven"])) {
+ $docHeaderFooter->setDifferentOddEven(TRUE);
+ } else {
+ $docHeaderFooter->setDifferentOddEven(FALSE);
+ }
+ if (isset($xmlSheet->headerFooter["differentFirst"]) &&
+ self::boolean((string)$xmlSheet->headerFooter["differentFirst"])) {
+ $docHeaderFooter->setDifferentFirst(TRUE);
+ } else {
+ $docHeaderFooter->setDifferentFirst(FALSE);
+ }
+ if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
+ !self::boolean((string)$xmlSheet->headerFooter["scaleWithDoc"])) {
+ $docHeaderFooter->setScaleWithDocument(FALSE);
+ } else {
+ $docHeaderFooter->setScaleWithDocument(TRUE);
+ }
+ if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
+ !self::boolean((string)$xmlSheet->headerFooter["alignWithMargins"])) {
+ $docHeaderFooter->setAlignWithMargins(FALSE);
+ } else {
+ $docHeaderFooter->setAlignWithMargins(TRUE);
+ }
+
+ $docHeaderFooter->setOddHeader((string) $xmlSheet->headerFooter->oddHeader);
+ $docHeaderFooter->setOddFooter((string) $xmlSheet->headerFooter->oddFooter);
+ $docHeaderFooter->setEvenHeader((string) $xmlSheet->headerFooter->evenHeader);
+ $docHeaderFooter->setEvenFooter((string) $xmlSheet->headerFooter->evenFooter);
+ $docHeaderFooter->setFirstHeader((string) $xmlSheet->headerFooter->firstHeader);
+ $docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
+ }
+
+ if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->_readDataOnly) {
+ foreach ($xmlSheet->rowBreaks->brk as $brk) {
+ if ($brk["man"]) {
+ $docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
+ }
+ }
+ }
+ if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
+ foreach ($xmlSheet->colBreaks->brk as $brk) {
+ if ($brk["man"]) {
+ $docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex((string) $brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
+ }
+ }
+ }
+
+ if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
+ foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
+ // Uppercase coordinate
+ $range = strtoupper($dataValidation["sqref"]);
+ $rangeSet = explode(' ',$range);
+ foreach($rangeSet as $range) {
+ $stRange = $docSheet->shrinkRangeToFit($range);
+
+ // Extract all cell references in $range
+ $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($stRange);
+ foreach ($aReferences as $reference) {
+ // Create validation
+ $docValidation = $docSheet->getCell($reference)->getDataValidation();
+ $docValidation->setType((string) $dataValidation["type"]);
+ $docValidation->setErrorStyle((string) $dataValidation["errorStyle"]);
+ $docValidation->setOperator((string) $dataValidation["operator"]);
+ $docValidation->setAllowBlank($dataValidation["allowBlank"] != 0);
+ $docValidation->setShowDropDown($dataValidation["showDropDown"] == 0);
+ $docValidation->setShowInputMessage($dataValidation["showInputMessage"] != 0);
+ $docValidation->setShowErrorMessage($dataValidation["showErrorMessage"] != 0);
+ $docValidation->setErrorTitle((string) $dataValidation["errorTitle"]);
+ $docValidation->setError((string) $dataValidation["error"]);
+ $docValidation->setPromptTitle((string) $dataValidation["promptTitle"]);
+ $docValidation->setPrompt((string) $dataValidation["prompt"]);
+ $docValidation->setFormula1((string) $dataValidation->formula1);
+ $docValidation->setFormula2((string) $dataValidation->formula2);
+ }
+ }
+ }
+ }
+
+ // Add hyperlinks
+ $hyperlinks = array();
+ if (!$this->_readDataOnly) {
+ // Locate hyperlink relations
+ if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($relsWorksheet->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
+ $hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
+ }
+ }
+ }
+
+ // Loop through hyperlinks
+ if ($xmlSheet && $xmlSheet->hyperlinks) {
+ foreach ($xmlSheet->hyperlinks->hyperlink as $hyperlink) {
+ // Link url
+ $linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+ foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
+ $cell = $docSheet->getCell( $cellReference );
+ if (isset($linkRel['id'])) {
+ $hyperlinkUrl = $hyperlinks[ (string)$linkRel['id'] ];
+ if (isset($hyperlink['location'])) {
+ $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
+ }
+ $cell->getHyperlink()->setUrl($hyperlinkUrl);
+ } elseif (isset($hyperlink['location'])) {
+ $cell->getHyperlink()->setUrl( 'sheet://' . (string)$hyperlink['location'] );
+ }
+
+ // Tooltip
+ if (isset($hyperlink['tooltip'])) {
+ $cell->getHyperlink()->setTooltip( (string)$hyperlink['tooltip'] );
+ }
+ }
+ }
+ }
+ }
+
+ // Add comments
+ $comments = array();
+ $vmlComments = array();
+ if (!$this->_readDataOnly) {
+ // Locate comment relations
+ if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
++ libxml_disable_entity_loader($loadEntities);
+ foreach ($relsWorksheet->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
+ $comments[(string)$ele["Id"]] = (string)$ele["Target"];
+ }
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+ $vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
+ }
+ }
+ }
+
+ // Loop through comments
+ foreach ($comments as $relName => $relPath) {
+ // Load comments file
+ $relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
+ $commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath) );
+
+ // Utility variables
+ $authors = array();
+
+ // Loop through authors
+ foreach ($commentsFile->authors->author as $author) {
+ $authors[] = (string)$author;
+ }
+
+ // Loop through contents
+ foreach ($commentsFile->commentList->comment as $comment) {
+ $docSheet->getComment( (string)$comment['ref'] )->setAuthor( $authors[(string)$comment['authorId']] );
+ $docSheet->getComment( (string)$comment['ref'] )->setText( $this->_parseRichText($comment->text) );
+ }
+ }
+
+ // Loop through VML comments
+ foreach ($vmlComments as $relName => $relPath) {
+ // Load VML comments file
+ $relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
+ $vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
+ $vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+ $shapes = $vmlCommentsFile->xpath('//v:shape');
+ foreach ($shapes as $shape) {
+ $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+ if (isset($shape['style'])) {
+ $style = (string)$shape['style'];
+ $fillColor = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
+ $column = null;
+ $row = null;
+
+ $clientData = $shape->xpath('.//x:ClientData');
+ if (is_array($clientData) && !empty($clientData)) {
+ $clientData = $clientData[0];
+
+ if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
+ $temp = $clientData->xpath('.//x:Row');
+ if (is_array($temp)) $row = $temp[0];
+
+ $temp = $clientData->xpath('.//x:Column');
+ if (is_array($temp)) $column = $temp[0];
+ }
+ }
+
+ if (($column !== NULL) && ($row !== NULL)) {
+ // Set comment properties
+ $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
+ $comment->getFillColor()->setRGB( $fillColor );
+
+ // Parse style
+ $styleArray = explode(';', str_replace(' ', '', $style));
+ foreach ($styleArray as $stylePair) {
+ $stylePair = explode(':', $stylePair);
+
+ if ($stylePair[0] == 'margin-left') $comment->setMarginLeft($stylePair[1]);
+ if ($stylePair[0] == 'margin-top') $comment->setMarginTop($stylePair[1]);
+ if ($stylePair[0] == 'width') $comment->setWidth($stylePair[1]);
+ if ($stylePair[0] == 'height') $comment->setHeight($stylePair[1]);
+ if ($stylePair[0] == 'visibility') $comment->setVisible( $stylePair[1] == 'visible' );
+
+ }
+ }
+ }
+ }
+ }
+
+ // Header/footer images
+ if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->_readDataOnly) {
+ if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+ $relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+ $vmlRelationship = '';
+
+ foreach ($relsWorksheet->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
+ $vmlRelationship = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
+ }
+ }
+
+ if ($vmlRelationship != '') {
+ // Fetch linked images
+ $relsVML = simplexml_load_string($this->_getFromZipArchive($zip, dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels' )); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+ $drawings = array();
+ foreach ($relsVML->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
+ $drawings[(string) $ele["Id"]] = self::dir_add($vmlRelationship, $ele["Target"]);
+ }
+ }
+
+ // Fetch VML document
+ $vmlDrawing = simplexml_load_string($this->_getFromZipArchive($zip, $vmlRelationship));
+ $vmlDrawing->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+
+ $hfImages = array();
+
+ $shapes = $vmlDrawing->xpath('//v:shape');
+ foreach ($shapes as $shape) {
+ $shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
+ $imageData = $shape->xpath('//v:imagedata');
+ $imageData = $imageData[0];
+
+ $imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
+ $style = self::toCSSArray( (string)$shape['style'] );
+
+ $hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
+ if (isset($imageData['title'])) {
+ $hfImages[ (string)$shape['id'] ]->setName( (string)$imageData['title'] );
+ }
+
+ $hfImages[ (string)$shape['id'] ]->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $drawings[(string)$imageData['relid']], false);
+ $hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
+ $hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
+ $hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
+ $hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
+ $hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
+ $hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
+ }
+
+ $docSheet->getHeaderFooter()->setImages($hfImages);
+ }
+ }
+ }
+
+ }
+
+// TODO: Autoshapes from twoCellAnchors!
+ if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
+ $relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+ $drawings = array();
+ foreach ($relsWorksheet->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
+ $drawings[(string) $ele["Id"]] = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
+ }
+ }
+ if ($xmlSheet->drawing && !$this->_readDataOnly) {
+ foreach ($xmlSheet->drawing as $drawing) {
+ $fileDrawing = $drawings[(string) self::array_item($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+ $relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip, dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+ $images = array();
+
+ if ($relsDrawing && $relsDrawing->Relationship) {
+ foreach ($relsDrawing->Relationship as $ele) {
+ if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
+ $images[(string) $ele["Id"]] = self::dir_add($fileDrawing, $ele["Target"]);
+ } elseif ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart") {
+ if ($this->_includeCharts) {
+ $charts[self::dir_add($fileDrawing, $ele["Target"])] = array('id' => (string) $ele["Id"],
+ 'sheet' => $docSheet->getTitle()
+ );
+ }
+ }
+ }
+ }
+ $xmlDrawing = simplexml_load_string($this->_getFromZipArchive($zip, $fileDrawing))->children("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
+
+ if ($xmlDrawing->oneCellAnchor) {
+ foreach ($xmlDrawing->oneCellAnchor as $oneCellAnchor) {
+ if ($oneCellAnchor->pic->blipFill) {
+ $blip = $oneCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
+ $xfrm = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
+ $outerShdw = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
+ $objDrawing = new PHPExcel_Worksheet_Drawing;
+ $objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
+ $objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
+ $objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+ $objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
+ $objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
+ $objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
+ $objDrawing->setResizeProportional(false);
+ $objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx")));
+ $objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy")));
+ if ($xfrm) {
+ $objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
+ }
+ if ($outerShdw) {
+ $shadow = $objDrawing->getShadow();
+ $shadow->setVisible(true);
+ $shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
+ $shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
+ $shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
+ $shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
+ $shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
+ $shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
+ }
+ $objDrawing->setWorksheet($docSheet);
+ } else {
+ // ? Can charts be positioned with a oneCellAnchor ?
+ $coordinates = PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
+ $offsetX = PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
+ $offsetY = PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
+ $width = PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
+ $height = PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
+ }
+ }
+ }
+ if ($xmlDrawing->twoCellAnchor) {
+ foreach ($xmlDrawing->twoCellAnchor as $twoCellAnchor) {
+ if ($twoCellAnchor->pic->blipFill) {
+ $blip = $twoCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
+ $xfrm = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
+ $outerShdw = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
+ $objDrawing = new PHPExcel_Worksheet_Drawing;
+ $objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
+ $objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
+ $objDrawing->setPath("zip://".PHPExcel_Shared_File::realpath($pFilename)."#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
+ $objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
+ $objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
+ $objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
+ $objDrawing->setResizeProportional(false);
+
+ $objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cx")));
+ $objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cy")));
+
+ if ($xfrm) {
+ $objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
+ }
+ if ($outerShdw) {
+ $shadow = $objDrawing->getShadow();
+ $shadow->setVisible(true);
+ $shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
+ $shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
+ $shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
+ $shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
+ $shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
+ $shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
+ }
+ $objDrawing->setWorksheet($docSheet);
+ } elseif(($this->_includeCharts) && ($twoCellAnchor->graphicFrame)) {
+ $fromCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
+ $fromOffsetX = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
+ $fromOffsetY = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
+ $toCoordinate = PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
+ $toOffsetX = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
+ $toOffsetY = PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
+ $graphic = $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
+ $chartRef = $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
+ $thisChart = (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+ $chartDetails[$docSheet->getTitle().'!'.$thisChart] =
+ array( 'fromCoordinate' => $fromCoordinate,
+ 'fromOffsetX' => $fromOffsetX,
+ 'fromOffsetY' => $fromOffsetY,
+ 'toCoordinate' => $toCoordinate,
+ 'toOffsetX' => $toOffsetX,
+ 'toOffsetY' => $toOffsetY,
+ 'worksheetTitle' => $docSheet->getTitle()
+ );
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ // Loop through definedNames
+ if ($xmlWorkbook->definedNames) {
+ foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+ // Extract range
+ $extractedRange = (string)$definedName;
+ $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
+ if (($spos = strpos($extractedRange,'!')) !== false) {
+ $extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+ } else {
+ $extractedRange = str_replace('$', '', $extractedRange);
+ }
+
+ // Valid range?
+ if (stripos((string)$definedName, '#REF!') !== FALSE || $extractedRange == '') {
+ continue;
+ }
+
+ // Some definedNames are only applicable if we are on the same sheet...
+ if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
+ // Switch on type
+ switch ((string)$definedName['name']) {
+
+ case '_xlnm._FilterDatabase':
+ if ((string)$definedName['hidden'] !== '1') {
+ $docSheet->getAutoFilter()->setRange($extractedRange);
+ }
+ break;
+
+ case '_xlnm.Print_Titles':
+ // Split $extractedRange
+ $extractedRange = explode(',', $extractedRange);
+
+ // Set print titles
+ foreach ($extractedRange as $range) {
+ $matches = array();
+ $range = str_replace('$', '', $range);
+
+ // check for repeating columns, e g. 'A:A' or 'A:D'
+ if (preg_match('/!?([A-Z]+)\:([A-Z]+)$/', $range, $matches)) {
+ $docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($matches[1], $matches[2]));
+ }
+ // check for repeating rows, e.g. '1:1' or '1:5'
+ elseif (preg_match('/!?(\d+)\:(\d+)$/', $range, $matches)) {
+ $docSheet->getPageSetup()->setRowsToRepeatAtTop(array($matches[1], $matches[2]));
+ }
+ }
+ break;
+
+ case '_xlnm.Print_Area':
+ $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma?
+ $newRangeSets = array();
+ foreach($rangeSets as $rangeSet) {
+ $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark?
+ $rangeSet = isset($range[1]) ? $range[1] : $range[0];
+ if (strpos($rangeSet, ':') === FALSE) {
+ $rangeSet = $rangeSet . ':' . $rangeSet;
+ }
+ $newRangeSets[] = str_replace('$', '', $rangeSet);
+ }
+ $docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets));
+ break;
+
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ // Next sheet id
+ ++$sheetId;
+ }
+
+ // Loop through definedNames
+ if ($xmlWorkbook->definedNames) {
+ foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
+ // Extract range
+ $extractedRange = (string)$definedName;
+ $extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
+ if (($spos = strpos($extractedRange,'!')) !== false) {
+ $extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
+ } else {
+ $extractedRange = str_replace('$', '', $extractedRange);
+ }
+
+ // Valid range?
+ if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+ continue;
+ }
+
+ // Some definedNames are only applicable if we are on the same sheet...
+ if ((string)$definedName['localSheetId'] != '') {
+ // Local defined name
+ // Switch on type
+ switch ((string)$definedName['name']) {
+
+ case '_xlnm._FilterDatabase':
+ case '_xlnm.Print_Titles':
+ case '_xlnm.Print_Area':
+ break;
+
+ default:
+ if ($mapSheetId[(integer) $definedName['localSheetId']] !== null) {
+ $range = explode('!', (string)$definedName);
+ if (count($range) == 2) {
+ $range[0] = str_replace("''", "'", $range[0]);
+ $range[0] = str_replace("'", "", $range[0]);
+ if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
+ $extractedRange = str_replace('$', '', $range[1]);
+ $scope = $docSheet->getParent()->getSheet($mapSheetId[(integer) $definedName['localSheetId']]);
+ $excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope) );
+ }
+ }
+ }
+ break;
+ }
+ } else if (!isset($definedName['localSheetId'])) {
+ // "Global" definedNames
+ $locatedSheet = null;
+ $extractedSheetName = '';
+ if (strpos( (string)$definedName, '!' ) !== false) {
+ // Extract sheet name
+ $extractedSheetName = PHPExcel_Worksheet::extractSheetTitle( (string)$definedName, true );
+ $extractedSheetName = $extractedSheetName[0];
+
+ // Locate sheet
+ $locatedSheet = $excel->getSheetByName($extractedSheetName);
+
+ // Modify range
+ $range = explode('!', $extractedRange);
+ $extractedRange = isset($range[1]) ? $range[1] : $range[0];
+ }
+
+ if ($locatedSheet !== NULL) {
+ $excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
+ }
+ }
+ }
+ }
+ }
+
+ if ((!$this->_readDataOnly) || (!empty($this->_loadSheetsOnly))) {
+ // active sheet index
+ $activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
+
+ // keep active sheet index if sheet is still loaded, else first sheet is set as the active
+ if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
+ $excel->setActiveSheetIndex($mapSheetId[$activeTab]);
+ } else {
+ if ($excel->getSheetCount() == 0) {
+ $excel->createSheet();
+ }
+ $excel->setActiveSheetIndex(0);
+ }
+ }
+ break;
+ }
+
+ }
+
+
+ if (!$this->_readDataOnly) {
+ $contentTypes = simplexml_load_string($this->_getFromZipArchive($zip, "[Content_Types].xml"));
+ foreach ($contentTypes->Override as $contentType) {
+ switch ($contentType["ContentType"]) {
+ case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
+ if ($this->_includeCharts) {
+ $chartEntryRef = ltrim($contentType['PartName'],'/');
+ $chartElements = simplexml_load_string($this->_getFromZipArchive($zip, $chartEntryRef));
+ $objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
+
+// echo 'Chart ',$chartEntryRef,'<br />';
+// var_dump($charts[$chartEntryRef]);
+//
+ if (isset($charts[$chartEntryRef])) {
+ $chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
+// echo 'Position Ref ',$chartPositionRef,'<br />';
+ if (isset($chartDetails[$chartPositionRef])) {
+// var_dump($chartDetails[$chartPositionRef]);
+
+ $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+ $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
+ $objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
+ $chartDetails[$chartPositionRef]['fromOffsetX'],
+ $chartDetails[$chartPositionRef]['fromOffsetY']
+ );
+ $objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
+ $chartDetails[$chartPositionRef]['toOffsetX'],
+ $chartDetails[$chartPositionRef]['toOffsetY']
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $zip->close();
+
+ return $excel;
+ }
+
+
+ private static function _readColor($color, $background=FALSE) {
+ if (isset($color["rgb"])) {
+ return (string)$color["rgb"];
+ } else if (isset($color["indexed"])) {
+ return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+ } else if (isset($color["theme"])) {
+ if (self::$_theme !== NULL) {
+ $returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
+ if (isset($color["tint"])) {
+ $tintAdjust = (float) $color["tint"];
+ $returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
+ }
+ return 'FF'.$returnColour;
+ }
+ }
+
+ if ($background) {
+ return 'FFFFFFFF';
+ }
+ return 'FF000000';
+ }
+
+
+ private static function _readStyle($docStyle, $style) {
+ // format code
+// if (isset($style->numFmt)) {
+// if (isset($style->numFmt['formatCode'])) {
+// $docStyle->getNumberFormat()->setFormatCode((string) $style->numFmt['formatCode']);
+// } else {
+ $docStyle->getNumberFormat()->setFormatCode($style->numFmt);
+// }
+// }
+
+ // font
+ if (isset($style->font)) {
+ $docStyle->getFont()->setName((string) $style->font->name["val"]);
+ $docStyle->getFont()->setSize((string) $style->font->sz["val"]);
+ if (isset($style->font->b)) {
+ $docStyle->getFont()->setBold(!isset($style->font->b["val"]) || self::boolean((string) $style->font->b["val"]));
+ }
+ if (isset($style->font->i)) {
+ $docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || self::boolean((string) $style->font->i["val"]));
+ }
+ if (isset($style->font->strike)) {
+ $docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || self::boolean((string) $style->font->strike["val"]));
+ }
+ $docStyle->getFont()->getColor()->setARGB(self::_readColor($style->font->color));
+
+ if (isset($style->font->u) && !isset($style->font->u["val"])) {
+ $docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+ } else if (isset($style->font->u) && isset($style->font->u["val"])) {
+ $docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
+ }
+
+ if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
+ $vertAlign = strtolower((string)$style->font->vertAlign["val"]);
+ if ($vertAlign == 'superscript') {
+ $docStyle->getFont()->setSuperScript(true);
+ }
+ if ($vertAlign == 'subscript') {
+ $docStyle->getFont()->setSubScript(true);
+ }
+ }
+ }
+
+ // fill
+ if (isset($style->fill)) {
+ if ($style->fill->gradientFill) {
+ $gradientFill = $style->fill->gradientFill[0];
+ if(!empty($gradientFill["type"])) {
+ $docStyle->getFill()->setFillType((string) $gradientFill["type"]);
+ }
+ $docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
+ $gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+ $docStyle->getFill()->getStartColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color) );
+ $docStyle->getFill()->getEndColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color) );
+ } elseif ($style->fill->patternFill) {
+ $patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
+ $docStyle->getFill()->setFillType($patternType);
+ if ($style->fill->patternFill->fgColor) {
+ $docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor,true));
+ } else {
+ $docStyle->getFill()->getStartColor()->setARGB('FF000000');
+ }
+ if ($style->fill->patternFill->bgColor) {
+ $docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor,true));
+ }
+ }
+ }
+
+ // border
+ if (isset($style->border)) {
+ $diagonalUp = self::boolean((string) $style->border["diagonalUp"]);
+ $diagonalDown = self::boolean((string) $style->border["diagonalDown"]);
+ if (!$diagonalUp && !$diagonalDown) {
+ $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
+ } elseif ($diagonalUp && !$diagonalDown) {
+ $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
+ } elseif (!$diagonalUp && $diagonalDown) {
+ $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
+ } else {
+ $docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
+ }
+ self::_readBorder($docStyle->getBorders()->getLeft(), $style->border->left);
+ self::_readBorder($docStyle->getBorders()->getRight(), $style->border->right);
+ self::_readBorder($docStyle->getBorders()->getTop(), $style->border->top);
+ self::_readBorder($docStyle->getBorders()->getBottom(), $style->border->bottom);
+ self::_readBorder($docStyle->getBorders()->getDiagonal(), $style->border->diagonal);
+ }
+
+ // alignment
+ if (isset($style->alignment)) {
+ $docStyle->getAlignment()->setHorizontal((string) $style->alignment["horizontal"]);
+ $docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
+
+ $textRotation = 0;
+ if ((int)$style->alignment["textRotation"] <= 90) {
+ $textRotation = (int)$style->alignment["textRotation"];
+ } else if ((int)$style->alignment["textRotation"] > 90) {
+ $textRotation = 90 - (int)$style->alignment["textRotation"];
+ }
+
+ $docStyle->getAlignment()->setTextRotation(intval($textRotation));
+ $docStyle->getAlignment()->setWrapText(self::boolean((string) $style->alignment["wrapText"]));
+ $docStyle->getAlignment()->setShrinkToFit(self::boolean((string) $style->alignment["shrinkToFit"]));
+ $docStyle->getAlignment()->setIndent( intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0 );
+ }
+
+ // protection
+ if (isset($style->protection)) {
+ if (isset($style->protection['locked'])) {
+ if (self::boolean((string) $style->protection['locked'])) {
+ $docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
+ } else {
+ $docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+ }
+ }
+
+ if (isset($style->protection['hidden'])) {
+ if (self::boolean((string) $style->protection['hidden'])) {
+ $docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
+ } else {
+ $docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
+ }
+ }
+ }
+ }
+
+
+ private static function _readBorder($docBorder, $eleBorder) {
+ if (isset($eleBorder["style"])) {
+ $docBorder->setBorderStyle((string) $eleBorder["style"]);
+ }
+ if (isset($eleBorder->color)) {
+ $docBorder->getColor()->setARGB(self::_readColor($eleBorder->color));
+ }
+ }
+
+
+ private function _parseRichText($is = null) {
+ $value = new PHPExcel_RichText();
+
+ if (isset($is->t)) {
+ $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $is->t ) );
+ } else {
+ foreach ($is->r as $run) {
+ if (!isset($run->rPr)) {
+ $objText = $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+
+ } else {
+ $objText = $value->createTextRun( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
+
+ if (isset($run->rPr->rFont["val"])) {
+ $objText->getFont()->setName((string) $run->rPr->rFont["val"]);
+ }
+
+ if (isset($run->rPr->sz["val"])) {
+ $objText->getFont()->setSize((string) $run->rPr->sz["val"]);
+ }
+
+ if (isset($run->rPr->color)) {
+ $objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($run->rPr->color) ) );
+ }
+
+ if ((isset($run->rPr->b["val"]) && self::boolean((string) $run->rPr->b["val"])) ||
+ (isset($run->rPr->b) && !isset($run->rPr->b["val"]))) {
+ $objText->getFont()->setBold(TRUE);
+ }
+
+ if ((isset($run->rPr->i["val"]) && self::boolean((string) $run->rPr->i["val"])) ||
+ (isset($run->rPr->i) && !isset($run->rPr->i["val"]))) {
+ $objText->getFont()->setItalic(TRUE);
+ }
+
+ if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
+ $vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
+ if ($vertAlign == 'superscript') {
+ $objText->getFont()->setSuperScript(TRUE);
+ }
+ if ($vertAlign == 'subscript') {
+ $objText->getFont()->setSubScript(TRUE);
+ }
+ }
+
+ if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
+ $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+ } else if (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
+ $objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
+ }
+
+ if ((isset($run->rPr->strike["val"]) && self::boolean((string) $run->rPr->strike["val"])) ||
+ (isset($run->rPr->strike) && !isset($run->rPr->strike["val"]))) {
+ $objText->getFont()->setStrikethrough(TRUE);
+ }
+ }
+ }
+ }
+
+ return $value;
+ }
+
+
+ private static function array_item($array, $key = 0) {
+ return (isset($array[$key]) ? $array[$key] : null);
+ }
+
+
+ private static function dir_add($base, $add) {
+ return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
+ }
+
+
+ private static function toCSSArray($style) {
+ $style = str_replace(array("\r","\n"), "", $style);
+
+ $temp = explode(';', $style);
+ $style = array();
+ foreach ($temp as $item) {
+ $item = explode(':', $item);
+
+ if (strpos($item[1], 'px') !== false) {
+ $item[1] = str_replace('px', '', $item[1]);
+ }
+ if (strpos($item[1], 'pt') !== false) {
+ $item[1] = str_replace('pt', '', $item[1]);
+ $item[1] = PHPExcel_Shared_Font::fontSizeToPixels($item[1]);
+ }
+ if (strpos($item[1], 'in') !== false) {
+ $item[1] = str_replace('in', '', $item[1]);
+ $item[1] = PHPExcel_Shared_Font::inchSizeToPixels($item[1]);
+ }
+ if (strpos($item[1], 'cm') !== false) {
+ $item[1] = str_replace('cm', '', $item[1]);
+ $item[1] = PHPExcel_Shared_Font::centimeterSizeToPixels($item[1]);
+ }
+
+ $style[$item[0]] = $item[1];
+ }
+
+ return $style;
+ }
+
+ private static function boolean($value = NULL)
+ {
+ if (is_numeric($value)) {
+ return (bool) $value;
+ }
+ return ($value === 'true' || $value === 'TRUE') ? TRUE : FALSE;
+ }
+}
diff --cc 3rdparty/PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php
index dff4768,0000000..52d6ac6
mode 100644,000000..100644
--- a/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php
+++ b/3rdparty/PHPExcel/Classes/PHPExcel/Reader/Gnumeric.php
@@@ -1,874 -1,0 +1,875 @@@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ * @version 1.7.9, 2013-06-02
+ */
+
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+ /**
+ * @ignore
+ */
+ define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+ require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Gnumeric
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+ /**
+ * Formats
+ *
+ * @var array
+ */
+ private $_styles = array();
+
+ /**
+ * Shared Expressions
+ *
+ * @var array
+ */
+ private $_expressions = array();
+
+ private $_referenceHelper = null;
+
+
+ /**
+ * Create a new PHPExcel_Reader_Gnumeric
+ */
+ public function __construct() {
+ $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+ $this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ }
+
+
+ /**
+ * Can the current PHPExcel_Reader_IReader read the file?
+ *
+ * @param string $pFilename
+ * @return boolean
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function canRead($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ // Check if gzlib functions are available
+ if (!function_exists('gzread')) {
+ throw new PHPExcel_Reader_Exception("gzlib library is not enabled");
+ }
+
+ // Read signature data (first 3 bytes)
+ $fh = fopen($pFilename, 'r');
+ $data = fread($fh, 2);
+ fclose($fh);
+
+ if ($data != chr(0x1F).chr(0x8B)) {
+ return false;
+ }
+
+ return true;
+ }
+
+
+ /**
+ * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetNames($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $xml = new XMLReader();
+ $xml->open(
+ 'compress.zlib://'.realpath($pFilename)
+ );
+ $xml->setParserProperty(2,true);
+
+ $worksheetNames = array();
+ while ($xml->read()) {
+ if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
+ $xml->read(); // Move onto the value node
+ $worksheetNames[] = (string) $xml->value;
+ } elseif ($xml->name == 'gnm:Sheets') {
+ // break out of the loop once we've got our sheet names rather than parse the entire file
+ break;
+ }
+ }
+
+ return $worksheetNames;
+ }
+
+
+ /**
+ * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetInfo($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $xml = new XMLReader();
+ $xml->open(
+ 'compress.zlib://'.realpath($pFilename)
+ );
+ $xml->setParserProperty(2,true);
+
+ $worksheetInfo = array();
+ while ($xml->read()) {
+ if ($xml->name == 'gnm:Sheet' && $xml->nodeType == XMLReader::ELEMENT) {
+ $tmpInfo = array(
+ 'worksheetName' => '',
+ 'lastColumnLetter' => 'A',
+ 'lastColumnIndex' => 0,
+ 'totalRows' => 0,
+ 'totalColumns' => 0,
+ );
+
+ while ($xml->read()) {
+ if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
+ $xml->read(); // Move onto the value node
+ $tmpInfo['worksheetName'] = (string) $xml->value;
+ } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
+ $xml->read(); // Move onto the value node
+ $tmpInfo['lastColumnIndex'] = (int) $xml->value;
+ $tmpInfo['totalColumns'] = (int) $xml->value + 1;
+ } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
+ $xml->read(); // Move onto the value node
+ $tmpInfo['totalRows'] = (int) $xml->value + 1;
+ break;
+ }
+ }
+ $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+ $worksheetInfo[] = $tmpInfo;
+ }
+ }
+
+ return $worksheetInfo;
+ }
+
+
+ private function _gzfileGetContents($filename) {
+ $file = @gzopen($filename, 'rb');
+ if ($file !== false) {
+ $data = '';
+ while (!gzeof($file)) {
+ $data .= gzread($file, 1024);
+ }
+ gzclose($file);
+ }
+ return $data;
+ }
+
+
+ /**
+ * Loads PHPExcel from file
+ *
+ * @param string $pFilename
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function load($pFilename)
+ {
+ // Create new PHPExcel
+ $objPHPExcel = new PHPExcel();
+
+ // Load into this instance
+ return $this->loadIntoExisting($pFilename, $objPHPExcel);
+ }
+
+
+ /**
+ * Loads PHPExcel from file into PHPExcel instance
+ *
+ * @param string $pFilename
+ * @param PHPExcel $objPHPExcel
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $timezoneObj = new DateTimeZone('Europe/London');
+ $GMT = new DateTimeZone('UTC');
+
+ $gFileData = $this->_gzfileGetContents($pFilename);
+
+// echo '<pre>';
+// echo htmlentities($gFileData,ENT_QUOTES,'UTF-8');
+// echo '</pre><hr />';
+//
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_string($gFileData);
++ libxml_disable_entity_loader($loadEntities);
+ $namespacesMeta = $xml->getNamespaces(true);
+
+// var_dump($namespacesMeta);
+//
+ $gnmXML = $xml->children($namespacesMeta['gnm']);
+
+ $docProps = $objPHPExcel->getProperties();
+ // Document Properties are held differently, depending on the version of Gnumeric
+ if (isset($namespacesMeta['office'])) {
+ $officeXML = $xml->children($namespacesMeta['office']);
+ $officeDocXML = $officeXML->{'document-meta'};
+ $officeDocMetaXML = $officeDocXML->meta;
+
+ foreach($officeDocMetaXML as $officePropertyData) {
+
+ $officePropertyDC = array();
+ if (isset($namespacesMeta['dc'])) {
+ $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
+ }
+ foreach($officePropertyDC as $propertyName => $propertyValue) {
+ $propertyValue = (string) $propertyValue;
+ switch ($propertyName) {
+ case 'title' :
+ $docProps->setTitle(trim($propertyValue));
+ break;
+ case 'subject' :
+ $docProps->setSubject(trim($propertyValue));
+ break;
+ case 'creator' :
+ $docProps->setCreator(trim($propertyValue));
+ $docProps->setLastModifiedBy(trim($propertyValue));
+ break;
+ case 'date' :
+ $creationDate = strtotime(trim($propertyValue));
+ $docProps->setCreated($creationDate);
+ $docProps->setModified($creationDate);
+ break;
+ case 'description' :
+ $docProps->setDescription(trim($propertyValue));
+ break;
+ }
+ }
+ $officePropertyMeta = array();
+ if (isset($namespacesMeta['meta'])) {
+ $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+ }
+ foreach($officePropertyMeta as $propertyName => $propertyValue) {
+ $attributes = $propertyValue->attributes($namespacesMeta['meta']);
+ $propertyValue = (string) $propertyValue;
+ switch ($propertyName) {
+ case 'keyword' :
+ $docProps->setKeywords(trim($propertyValue));
+ break;
+ case 'initial-creator' :
+ $docProps->setCreator(trim($propertyValue));
+ $docProps->setLastModifiedBy(trim($propertyValue));
+ break;
+ case 'creation-date' :
+ $creationDate = strtotime(trim($propertyValue));
+ $docProps->setCreated($creationDate);
+ $docProps->setModified($creationDate);
+ break;
+ case 'user-defined' :
+ list(,$attrName) = explode(':',$attributes['name']);
+ switch ($attrName) {
+ case 'publisher' :
+ $docProps->setCompany(trim($propertyValue));
+ break;
+ case 'category' :
+ $docProps->setCategory(trim($propertyValue));
+ break;
+ case 'manager' :
+ $docProps->setManager(trim($propertyValue));
+ break;
+ }
+ break;
+ }
+ }
+ }
+ } elseif (isset($gnmXML->Summary)) {
+ foreach($gnmXML->Summary->Item as $summaryItem) {
+ $propertyName = $summaryItem->name;
+ $propertyValue = $summaryItem->{'val-string'};
+ switch ($propertyName) {
+ case 'title' :
+ $docProps->setTitle(trim($propertyValue));
+ break;
+ case 'comments' :
+ $docProps->setDescription(trim($propertyValue));
+ break;
+ case 'keywords' :
+ $docProps->setKeywords(trim($propertyValue));
+ break;
+ case 'category' :
+ $docProps->setCategory(trim($propertyValue));
+ break;
+ case 'manager' :
+ $docProps->setManager(trim($propertyValue));
+ break;
+ case 'author' :
+ $docProps->setCreator(trim($propertyValue));
+ $docProps->setLastModifiedBy(trim($propertyValue));
+ break;
+ case 'company' :
+ $docProps->setCompany(trim($propertyValue));
+ break;
+ }
+ }
+ }
+
+ $worksheetID = 0;
+ foreach($gnmXML->Sheets->Sheet as $sheet) {
+ $worksheetName = (string) $sheet->Name;
+// echo '<b>Worksheet: ',$worksheetName,'</b><br />';
+ if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
+ continue;
+ }
+
+ $maxRow = $maxCol = 0;
+
+ // Create new Worksheet
+ $objPHPExcel->createSheet();
+ $objPHPExcel->setActiveSheetIndex($worksheetID);
+ // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+ // cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+ // name in line with the formula, not the reverse
+ $objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+
+ if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
+ if (isset($sheet->PrintInformation->Margins)) {
+ foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
+ $marginAttributes = $margin->attributes();
+ $marginSize = 72 / 100; // Default
+ switch($marginAttributes['PrefUnit']) {
+ case 'mm' :
+ $marginSize = intval($marginAttributes['Points']) / 100;
+ break;
+ }
+ switch($key) {
+ case 'top' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
+ break;
+ case 'bottom' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+ break;
+ case 'left' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+ break;
+ case 'right' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setRight($marginSize);
+ break;
+ case 'header' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+ break;
+ case 'footer' :
+ $objPHPExcel->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+ break;
+ }
+ }
+ }
+ }
+
+ foreach($sheet->Cells->Cell as $cell) {
+ $cellAttributes = $cell->attributes();
+ $row = (int) $cellAttributes->Row + 1;
+ $column = (int) $cellAttributes->Col;
+
+ if ($row > $maxRow) $maxRow = $row;
+ if ($column > $maxCol) $maxCol = $column;
+
+ $column = PHPExcel_Cell::stringFromColumnIndex($column);
+
+ // Read cell?
+ if ($this->getReadFilter() !== NULL) {
+ if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
+ continue;
+ }
+ }
+
+ $ValueType = $cellAttributes->ValueType;
+ $ExprID = (string) $cellAttributes->ExprID;
+// echo 'Cell ',$column,$row,'<br />';
+// echo 'Type is ',$ValueType,'<br />';
+// echo 'Value is ',$cell,'<br />';
+ $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+ if ($ExprID > '') {
+ if (((string) $cell) > '') {
+
+ $this->_expressions[$ExprID] = array( 'column' => $cellAttributes->Col,
+ 'row' => $cellAttributes->Row,
+ 'formula' => (string) $cell
+ );
+// echo 'NEW EXPRESSION ',$ExprID,'<br />';
+ } else {
+ $expression = $this->_expressions[$ExprID];
+
+ $cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
+ 'A1',
+ $cellAttributes->Col - $expression['column'],
+ $cellAttributes->Row - $expression['row'],
+ $worksheetName
+ );
+// echo 'SHARED EXPRESSION ',$ExprID,'<br />';
+// echo 'New Value is ',$cell,'<br />';
+ }
+ $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+ } else {
+ switch($ValueType) {
+ case '10' : // NULL
+ $type = PHPExcel_Cell_DataType::TYPE_NULL;
+ break;
+ case '20' : // Boolean
+ $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+ $cell = ($cell == 'TRUE') ? True : False;
+ break;
+ case '30' : // Integer
+ $cell = intval($cell);
+ case '40' : // Float
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ break;
+ case '50' : // Error
+ $type = PHPExcel_Cell_DataType::TYPE_ERROR;
+ break;
+ case '60' : // String
+ $type = PHPExcel_Cell_DataType::TYPE_STRING;
+ break;
+ case '70' : // Cell Range
+ case '80' : // Array
+ }
+ }
+ $objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
+ }
+
+ if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
+ foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
+ $commentAttributes = $comment->attributes();
+ // Only comment objects are handled at the moment
+ if ($commentAttributes->Text) {
+ $objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
+ ->setAuthor( (string)$commentAttributes->Author )
+ ->setText($this->_parseRichText((string)$commentAttributes->Text) );
+ }
+ }
+ }
+// echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
+//
+ foreach($sheet->Styles->StyleRegion as $styleRegion) {
+ $styleAttributes = $styleRegion->attributes();
+ if (($styleAttributes['startRow'] <= $maxRow) &&
+ ($styleAttributes['startCol'] <= $maxCol)) {
+
+ $startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
+ $startRow = $styleAttributes['startRow'] + 1;
+
+ $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
+ $endColumn = PHPExcel_Cell::stringFromColumnIndex($endColumn);
+ $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
+ $endRow += 1;
+ $cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
+// echo $cellRange,'<br />';
+
+ $styleAttributes = $styleRegion->Style->attributes();
+// var_dump($styleAttributes);
+// echo '<br />';
+
+ // We still set the number format mask for date/time values, even if _readDataOnly is true
+ if ((!$this->_readDataOnly) ||
+ (PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
+ $styleArray = array();
+ $styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
+ // If _readDataOnly is false, we set all formatting information
+ if (!$this->_readDataOnly) {
+ switch($styleAttributes['HAlign']) {
+ case '1' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+ break;
+ case '2' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_LEFT;
+ break;
+ case '4' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_RIGHT;
+ break;
+ case '8' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER;
+ break;
+ case '16' :
+ case '64' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS;
+ break;
+ case '32' :
+ $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY;
+ break;
+ }
+
+ switch($styleAttributes['VAlign']) {
+ case '1' :
+ $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
+ break;
+ case '2' :
+ $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+ break;
+ case '4' :
+ $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_CENTER;
+ break;
+ case '8' :
+ $styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_JUSTIFY;
+ break;
+ }
+
+ $styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? True : False;
+ $styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? True : False;
+ $styleArray['alignment']['indent'] = (intval($styleAttributes["Indent"]) > 0) ? $styleAttributes["indent"] : 0;
+
+ $RGB = self::_parseGnumericColour($styleAttributes["Fore"]);
+ $styleArray['font']['color']['rgb'] = $RGB;
+ $RGB = self::_parseGnumericColour($styleAttributes["Back"]);
+ $shade = $styleAttributes["Shade"];
+ if (($RGB != '000000') || ($shade != '0')) {
+ $styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
+ $RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
+ $styleArray['fill']['endcolor']['rgb'] = $RGB2;
+ switch($shade) {
+ case '1' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
+ break;
+ case '2' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR;
+ break;
+ case '3' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_PATH;
+ break;
+ case '4' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
+ break;
+ case '5' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
+ break;
+ case '6' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
+ break;
+ case '7' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
+ break;
+ case '8' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
+ break;
+ case '9' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
+ break;
+ case '10' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
+ break;
+ case '11' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
+ break;
+ case '12' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
+ break;
+ case '13' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
+ break;
+ case '14' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
+ break;
+ case '15' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
+ break;
+ case '16' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
+ break;
+ case '17' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
+ break;
+ case '18' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
+ break;
+ case '19' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
+ break;
+ case '20' :
+ $styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
+ break;
+ }
+ }
+
+ $fontAttributes = $styleRegion->Style->Font->attributes();
+// var_dump($fontAttributes);
+// echo '<br />';
+ $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
+ $styleArray['font']['size'] = intval($fontAttributes['Unit']);
+ $styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
+ $styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
+ $styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
+ switch($fontAttributes['Underline']) {
+ case '1' :
+ $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
+ break;
+ case '2' :
+ $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLE;
+ break;
+ case '3' :
+ $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING;
+ break;
+ case '4' :
+ $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING;
+ break;
+ default :
+ $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
+ break;
+ }
+ switch($fontAttributes['Script']) {
+ case '1' :
+ $styleArray['font']['superScript'] = True;
+ break;
+ case '-1' :
+ $styleArray['font']['subScript'] = True;
+ break;
+ }
+
+ if (isset($styleRegion->Style->StyleBorder)) {
+ if (isset($styleRegion->Style->StyleBorder->Top)) {
+ $styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
+ }
+ if (isset($styleRegion->Style->StyleBorder->Bottom)) {
+ $styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
+ }
+ if (isset($styleRegion->Style->StyleBorder->Left)) {
+ $styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
+ }
+ if (isset($styleRegion->Style->StyleBorder->Right)) {
+ $styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
+ }
+ if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
+ $styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+ $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
+ } elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
+ $styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+ $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
+ } elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
+ $styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
+ $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
+ }
+ }
+ if (isset($styleRegion->Style->HyperLink)) {
+ // TO DO
+ $hyperlink = $styleRegion->Style->HyperLink->attributes();
+ }
+ }
+// var_dump($styleArray);
+// echo '<br />';
+ $objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
+ }
+ }
+ }
+
+ if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
+ // Column Widths
+ $columnAttributes = $sheet->Cols->attributes();
+ $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
+ $c = 0;
+ foreach($sheet->Cols->ColInfo as $columnOverride) {
+ $columnAttributes = $columnOverride->attributes();
+ $column = $columnAttributes['No'];
+ $columnWidth = $columnAttributes['Unit'] / 5.4;
+ $hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
+ $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
+ while ($c < $column) {
+ $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
+ ++$c;
+ }
+ while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
+ $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
+ if ($hidden) {
+ $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
+ }
+ ++$c;
+ }
+ }
+ while ($c <= $maxCol) {
+ $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
+ ++$c;
+ }
+ }
+
+ if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
+ // Row Heights
+ $rowAttributes = $sheet->Rows->attributes();
+ $defaultHeight = $rowAttributes['DefaultSizePts'];
+ $r = 0;
+
+ foreach($sheet->Rows->RowInfo as $rowOverride) {
+ $rowAttributes = $rowOverride->attributes();
+ $row = $rowAttributes['No'];
+ $rowHeight = $rowAttributes['Unit'];
+ $hidden = ((isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1')) ? true : false;
+ $rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
+ while ($r < $row) {
+ ++$r;
+ $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+ }
+ while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
+ ++$r;
+ $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
+ if ($hidden) {
+ $objPHPExcel->getActiveSheet()->getRowDimension($r)->setVisible(false);
+ }
+ }
+ }
+ while ($r < $maxRow) {
+ ++$r;
+ $objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+ }
+ }
+
+ // Handle Merged Cells in this worksheet
+ if (isset($sheet->MergedRegions)) {
+ foreach($sheet->MergedRegions->Merge as $mergeCells) {
+ if (strpos($mergeCells,':') !== FALSE) {
+ $objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
+ }
+ }
+ }
+
+ $worksheetID++;
+ }
+
+ // Loop through definedNames (global named ranges)
+ if (isset($gnmXML->Names)) {
+ foreach($gnmXML->Names->Name as $namedRange) {
+ $name = (string) $namedRange->name;
+ $range = (string) $namedRange->value;
+ if (stripos($range, '#REF!') !== false) {
+ continue;
+ }
+
+ $range = explode('!',$range);
+ $range[0] = trim($range[0],"'");;
+ if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
+ $extractedRange = str_replace('$', '', $range[1]);
+ $objPHPExcel->addNamedRange( new PHPExcel_NamedRange($name, $worksheet, $extractedRange) );
+ }
+ }
+ }
+
+
+ // Return
+ return $objPHPExcel;
+ }
+
+
+ private static function _parseBorderAttributes($borderAttributes)
+ {
+ $styleArray = array();
+
+ if (isset($borderAttributes["Color"])) {
+ $RGB = self::_parseGnumericColour($borderAttributes["Color"]);
+ $styleArray['color']['rgb'] = $RGB;
+ }
+
+ switch ($borderAttributes["Style"]) {
+ case '0' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_NONE;
+ break;
+ case '1' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_THIN;
+ break;
+ case '2' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
+ break;
+ case '4' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
+ break;
+ case '5' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_THICK;
+ break;
+ case '6' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_DOUBLE;
+ break;
+ case '7' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
+ break;
+ case '9' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
+ break;
+ case '10' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
+ break;
+ case '11' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOTDOT;
+ break;
+ case '12' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+ break;
+ case '13' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
+ break;
+ case '3' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
+ break;
+ case '8' :
+ $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
+ break;
+ }
+ return $styleArray;
+ }
+
+
+ private function _parseRichText($is = '') {
+ $value = new PHPExcel_RichText();
+
+ $value->createText($is);
+
+ return $value;
+ }
+
+
+ private static function _parseGnumericColour($gnmColour) {
+ list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
+ $gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
+ $gnmG = substr(str_pad($gnmG,4,'0',STR_PAD_RIGHT),0,2);
+ $gnmB = substr(str_pad($gnmB,4,'0',STR_PAD_RIGHT),0,2);
+ $RGB = $gnmR.$gnmG.$gnmB;
+// echo 'Excel Colour: ',$RGB,'<br />';
+ return $RGB;
+ }
+
+}
diff --cc 3rdparty/PHPExcel/Classes/PHPExcel/Reader/OOCalc.php
index 63b0a78,0000000..7a90cfc
mode 100644,000000..100644
--- a/3rdparty/PHPExcel/Classes/PHPExcel/Reader/OOCalc.php
+++ b/3rdparty/PHPExcel/Classes/PHPExcel/Reader/OOCalc.php
@@@ -1,698 -1,0 +1,701 @@@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ * @version 1.7.9, 2013-06-02
+ */
+
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+ /**
+ * @ignore
+ */
+ define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+ require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_OOCalc
+ *
+ * @category PHPExcel
+ * @package PHPExcel_Reader
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
+{
+ /**
+ * Formats
+ *
+ * @var array
+ */
+ private $_styles = array();
+
+
+ /**
+ * Create a new PHPExcel_Reader_OOCalc
+ */
+ public function __construct() {
+ $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+ }
+
+
+ /**
+ * Can the current PHPExcel_Reader_IReader read the file?
+ *
+ * @param string $pFilename
+ * @return boolean
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function canRead($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ // Check if zip class exists
+ if (!class_exists('ZipArchive',FALSE)) {
+ throw new PHPExcel_Reader_Exception("ZipArchive library is not enabled");
+ }
+
+ $mimeType = 'UNKNOWN';
+ // Load file
+ $zip = new ZipArchive;
+ if ($zip->open($pFilename) === true) {
+ // check if it is an OOXML archive
+ $stat = $zip->statName('mimetype');
+ if ($stat && ($stat['size'] <= 255)) {
+ $mimeType = $zip->getFromName($stat['name']);
+ } elseif($stat = $zip->statName('META-INF/manifest.xml')) {
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_string($zip->getFromName('META-INF/manifest.xml'));
++ libxml_disable_entity_loader($loadEntities);
+ $namespacesContent = $xml->getNamespaces(true);
+ if (isset($namespacesContent['manifest'])) {
+ $manifest = $xml->children($namespacesContent['manifest']);
+ foreach($manifest as $manifestDataSet) {
+ $manifestAttributes = $manifestDataSet->attributes($namespacesContent['manifest']);
+ if ($manifestAttributes->{'full-path'} == '/') {
+ $mimeType = (string) $manifestAttributes->{'media-type'};
+ break;
+ }
+ }
+ }
+ }
+
+ $zip->close();
+
+ return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
+ }
+
+ return FALSE;
+ }
+
+
+ /**
+ * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetNames($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $zip = new ZipArchive;
+ if (!$zip->open($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+ }
+
+ $worksheetNames = array();
+
+ $xml = new XMLReader();
+ $res = $xml->open('zip://'.realpath($pFilename).'#content.xml');
+ $xml->setParserProperty(2,true);
+
+ // Step into the first level of content of the XML
+ $xml->read();
+ while ($xml->read()) {
+ // Quickly jump through to the office:body node
+ while ($xml->name !== 'office:body') {
+ if ($xml->isEmptyElement)
+ $xml->read();
+ else
+ $xml->next();
+ }
+ // Now read each node until we find our first table:table node
+ while ($xml->read()) {
+ if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+ // Loop through each table:table node reading the table:name attribute for each worksheet name
+ do {
+ $worksheetNames[] = $xml->getAttribute('table:name');
+ $xml->next();
+ } while ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT);
+ }
+ }
+ }
+
+ return $worksheetNames;
+ }
+
+
+ /**
+ * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetInfo($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $worksheetInfo = array();
+
+ $zip = new ZipArchive;
+ if (!$zip->open($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+ }
+
+ $xml = new XMLReader();
+ $res = $xml->open('zip://'.realpath($pFilename).'#content.xml');
+ $xml->setParserProperty(2,true);
+
+ // Step into the first level of content of the XML
+ $xml->read();
+ while ($xml->read()) {
+ // Quickly jump through to the office:body node
+ while ($xml->name !== 'office:body') {
+ if ($xml->isEmptyElement)
+ $xml->read();
+ else
+ $xml->next();
+ }
+ // Now read each node until we find our first table:table node
+ while ($xml->read()) {
+ if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
+ $worksheetNames[] = $xml->getAttribute('table:name');
+
+ $tmpInfo = array(
+ 'worksheetName' => $xml->getAttribute('table:name'),
+ 'lastColumnLetter' => 'A',
+ 'lastColumnIndex' => 0,
+ 'totalRows' => 0,
+ 'totalColumns' => 0,
+ );
+
+ // Loop through each child node of the table:table element reading
+ $currCells = 0;
+ do {
+ $xml->read();
+ if ($xml->name == 'table:table-row' && $xml->nodeType == XMLReader::ELEMENT) {
+ $rowspan = $xml->getAttribute('table:number-rows-repeated');
+ $rowspan = empty($rowspan) ? 1 : $rowspan;
+ $tmpInfo['totalRows'] += $rowspan;
+ $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
+ $currCells = 0;
+ // Step into the row
+ $xml->read();
+ do {
+ if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+ if (!$xml->isEmptyElement) {
+ $currCells++;
+ $xml->next();
+ } else {
+ $xml->read();
+ }
+ } elseif ($xml->name == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
+ $mergeSize = $xml->getAttribute('table:number-columns-repeated');
+ $currCells += $mergeSize;
+ $xml->read();
+ }
+ } while ($xml->name != 'table:table-row');
+ }
+ } while ($xml->name != 'table:table');
+
+ $tmpInfo['totalColumns'] = max($tmpInfo['totalColumns'],$currCells);
+ $tmpInfo['lastColumnIndex'] = $tmpInfo['totalColumns'] - 1;
+ $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+ $worksheetInfo[] = $tmpInfo;
+ }
+ }
+
+// foreach($workbookData->table as $worksheetDataSet) {
+// $worksheetData = $worksheetDataSet->children($namespacesContent['table']);
+// $worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
+//
+// $rowIndex = 0;
+// foreach ($worksheetData as $key => $rowData) {
+// switch ($key) {
+// case 'table-row' :
+// $rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+// $rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
+// $rowDataTableAttributes['number-rows-repeated'] : 1;
+// $columnIndex = 0;
+//
+// foreach ($rowData as $key => $cellData) {
+// $cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
+// $colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
+// $cellDataTableAttributes['number-columns-repeated'] : 1;
+// $cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
+// if (isset($cellDataOfficeAttributes['value-type'])) {
+// $tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex + $colRepeats - 1);
+// $tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex + $rowRepeats);
+// }
+// $columnIndex += $colRepeats;
+// }
+// $rowIndex += $rowRepeats;
+// break;
+// }
+// }
+//
+// $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+// $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+//
+// }
+// }
+ }
+
+ return $worksheetInfo;
+ }
+
+
+ /**
+ * Loads PHPExcel from file
+ *
+ * @param string $pFilename
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function load($pFilename)
+ {
+ // Create new PHPExcel
+ $objPHPExcel = new PHPExcel();
+
+ // Load into this instance
+ return $this->loadIntoExisting($pFilename, $objPHPExcel);
+ }
+
+
+ private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+ $styleAttributeValue = strtolower($styleAttributeValue);
+ foreach($styleList as $style) {
+ if ($styleAttributeValue == strtolower($style)) {
+ $styleAttributeValue = $style;
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * Loads PHPExcel from file into PHPExcel instance
+ *
+ * @param string $pFilename
+ * @param PHPExcel $objPHPExcel
+ * @return PHPExcel
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+ }
+
+ $timezoneObj = new DateTimeZone('Europe/London');
+ $GMT = new DateTimeZone('UTC');
+
+ $zip = new ZipArchive;
+ if (!$zip->open($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
+ }
+
+// echo '<h1>Meta Information</h1>';
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_string($zip->getFromName("meta.xml"));
++ libxml_disable_entity_loader($loadEntities);
+ $namespacesMeta = $xml->getNamespaces(true);
+// echo '<pre>';
+// print_r($namespacesMeta);
+// echo '</pre><hr />';
+
+ $docProps = $objPHPExcel->getProperties();
+ $officeProperty = $xml->children($namespacesMeta['office']);
+ foreach($officeProperty as $officePropertyData) {
+ $officePropertyDC = array();
+ if (isset($namespacesMeta['dc'])) {
+ $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
+ }
+ foreach($officePropertyDC as $propertyName => $propertyValue) {
+ switch ($propertyName) {
+ case 'title' :
+ $docProps->setTitle($propertyValue);
+ break;
+ case 'subject' :
+ $docProps->setSubject($propertyValue);
+ break;
+ case 'creator' :
+ $docProps->setCreator($propertyValue);
+ $docProps->setLastModifiedBy($propertyValue);
+ break;
+ case 'date' :
+ $creationDate = strtotime($propertyValue);
+ $docProps->setCreated($creationDate);
+ $docProps->setModified($creationDate);
+ break;
+ case 'description' :
+ $docProps->setDescription($propertyValue);
+ break;
+ }
+ }
+ $officePropertyMeta = array();
+ if (isset($namespacesMeta['dc'])) {
+ $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+ }
+ foreach($officePropertyMeta as $propertyName => $propertyValue) {
+ $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
+ switch ($propertyName) {
+ case 'initial-creator' :
+ $docProps->setCreator($propertyValue);
+ break;
+ case 'keyword' :
+ $docProps->setKeywords($propertyValue);
+ break;
+ case 'creation-date' :
+ $creationDate = strtotime($propertyValue);
+ $docProps->setCreated($creationDate);
+ break;
+ case 'user-defined' :
+ $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+ foreach ($propertyValueAttributes as $key => $value) {
+ if ($key == 'name') {
+ $propertyValueName = (string) $value;
+ } elseif($key == 'value-type') {
+ switch ($value) {
+ case 'date' :
+ $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'date');
+ $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
+ break;
+ case 'boolean' :
+ $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'bool');
+ $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+ break;
+ case 'float' :
+ $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'r4');
+ $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
+ break;
+ default :
+ $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+ }
+ }
+ }
+ $docProps->setCustomProperty($propertyValueName,$propertyValue,$propertyValueType);
+ break;
+ }
+ }
+ }
+
+
+// echo '<h1>Workbook Content</h1>';
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_string($zip->getFromName("content.xml"));
++ libxml_disable_entity_loader($loadEntities);
+ $namespacesContent = $xml->getNamespaces(true);
+// echo '<pre>';
+// print_r($namespacesContent);
+// echo '</pre><hr />';
+
+ $workbook = $xml->children($namespacesContent['office']);
+ foreach($workbook->body->spreadsheet as $workbookData) {
+ $workbookData = $workbookData->children($namespacesContent['table']);
+ $worksheetID = 0;
+ foreach($workbookData->table as $worksheetDataSet) {
+ $worksheetData = $worksheetDataSet->children($namespacesContent['table']);
+// print_r($worksheetData);
+// echo '<br />';
+ $worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
+// print_r($worksheetDataAttributes);
+// echo '<br />';
+ if ((isset($this->_loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
+ (!in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
+ continue;
+ }
+
+// echo '<h2>Worksheet '.$worksheetDataAttributes['name'].'</h2>';
+ // Create new Worksheet
+ $objPHPExcel->createSheet();
+ $objPHPExcel->setActiveSheetIndex($worksheetID);
+ if (isset($worksheetDataAttributes['name'])) {
+ $worksheetName = (string) $worksheetDataAttributes['name'];
+ // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+ // formula cells... during the load, all formulae should be correct, and we're simply
+ // bringing the worksheet name in line with the formula, not the reverse
+ $objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
+ }
+
+ $rowID = 1;
+ foreach($worksheetData as $key => $rowData) {
+// echo '<b>'.$key.'</b><br />';
+ switch ($key) {
+ case 'table-header-rows':
+ foreach ($rowData as $key=>$cellData) {
+ $rowData = $cellData;
+ break;
+ }
+ case 'table-row' :
+ $rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+ $rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
+ $rowDataTableAttributes['number-rows-repeated'] : 1;
+ $columnID = 'A';
+ foreach($rowData as $key => $cellData) {
+ if ($this->getReadFilter() !== NULL) {
+ if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+ continue;
+ }
+ }
+
+// echo '<b>'.$columnID.$rowID.'</b><br />';
+ $cellDataText = (isset($namespacesContent['text'])) ?
+ $cellData->children($namespacesContent['text']) :
+ '';
+ $cellDataOffice = $cellData->children($namespacesContent['office']);
+ $cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
+ $cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
+
+// echo 'Office Attributes: ';
+// print_r($cellDataOfficeAttributes);
+// echo '<br />Table Attributes: ';
+// print_r($cellDataTableAttributes);
+// echo '<br />Cell Data Text';
+// print_r($cellDataText);
+// echo '<br />';
+//
+ $type = $formatting = $hyperlink = null;
+ $hasCalculatedValue = false;
+ $cellDataFormula = '';
+ if (isset($cellDataTableAttributes['formula'])) {
+ $cellDataFormula = $cellDataTableAttributes['formula'];
+ $hasCalculatedValue = true;
+ }
+
+ if (isset($cellDataOffice->annotation)) {
+// echo 'Cell has comment<br />';
+ $annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
+ $textArray = array();
+ foreach($annotationText as $t) {
+ foreach($t->span as $text) {
+ $textArray[] = (string)$text;
+ }
+ }
+ $text = implode("\n",$textArray);
+// echo $text,'<br />';
+ $objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
+// ->setAuthor( $author )
+ ->setText($this->_parseRichText($text) );
+ }
+
+ if (isset($cellDataText->p)) {
+ // Consolidate if there are multiple p records (maybe with spans as well)
+ $dataArray = array();
+ // Text can have multiple text:p and within those, multiple text:span.
+ // text:p newlines, but text:span does not.
+ // Also, here we assume there is no text data is span fields are specified, since
+ // we have no way of knowing proper positioning anyway.
+ foreach ($cellDataText->p as $pData) {
+ if (isset($pData->span)) {
+ // span sections do not newline, so we just create one large string here
+ $spanSection = "";
+ foreach ($pData->span as $spanData) {
+ $spanSection .= $spanData;
+ }
+ array_push($dataArray, $spanSection);
+ } else {
+ array_push($dataArray, $pData);
+ }
+ }
+ $allCellDataText = implode($dataArray, "\n");
+
+// echo 'Value Type is '.$cellDataOfficeAttributes['value-type'].'<br />';
+ switch ($cellDataOfficeAttributes['value-type']) {
+ case 'string' :
+ $type = PHPExcel_Cell_DataType::TYPE_STRING;
+ $dataValue = $allCellDataText;
+ if (isset($dataValue->a)) {
+ $dataValue = $dataValue->a;
+ $cellXLinkAttributes = $dataValue->attributes($namespacesContent['xlink']);
+ $hyperlink = $cellXLinkAttributes['href'];
+ }
+ break;
+ case 'boolean' :
+ $type = PHPExcel_Cell_DataType::TYPE_BOOL;
+ $dataValue = ($allCellDataText == 'TRUE') ? True : False;
+ break;
+ case 'percentage' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $dataValue = (float) $cellDataOfficeAttributes['value'];
+ if (floor($dataValue) == $dataValue) {
+ $dataValue = (integer) $dataValue;
+ }
+ $formatting = PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00;
+ break;
+ case 'currency' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $dataValue = (float) $cellDataOfficeAttributes['value'];
+ if (floor($dataValue) == $dataValue) {
+ $dataValue = (integer) $dataValue;
+ }
+ $formatting = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
+ break;
+ case 'float' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $dataValue = (float) $cellDataOfficeAttributes['value'];
+ if (floor($dataValue) == $dataValue) {
+ if ($dataValue = (integer) $dataValue)
+ $dataValue = (integer) $dataValue;
+ else
+ $dataValue = (float) $dataValue;
+ }
+ break;
+ case 'date' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
+ $dateObj->setTimeZone($timezoneObj);
+ list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s'));
+ $dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second);
+ if ($dataValue != floor($dataValue)) {
+ $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15.' '.PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
+ } else {
+ $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15;
+ }
+ break;
+ case 'time' :
+ $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+ $dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':',sscanf($cellDataOfficeAttributes['time-value'],'PT%dH%dM%dS'))));
+ $formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
+ break;
+ }
+// echo 'Data value is '.$dataValue.'<br />';
+// if ($hyperlink !== NULL) {
+// echo 'Hyperlink is '.$hyperlink.'<br />';
+// }
+ } else {
+ $type = PHPExcel_Cell_DataType::TYPE_NULL;
+ $dataValue = NULL;
+ }
+
+ if ($hasCalculatedValue) {
+ $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
+// echo 'Formula: '.$cellDataFormula.'<br />';
+ $cellDataFormula = substr($cellDataFormula,strpos($cellDataFormula,':=')+1);
+ $temp = explode('"',$cellDataFormula);
+ $tKey = false;
+ foreach($temp as &$value) {
+ // Only replace in alternate array entries (i.e. non-quoted blocks)
+ if ($tKey = !$tKey) {
+ $value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value);
+ $value = preg_replace('/\[\.(.*)\]/Ui','$1',$value);
+ $value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces);
+ }
+ }
+ unset($value);
+ // Then rebuild the formula string
+ $cellDataFormula = implode('"',$temp);
+// echo 'Adjusted Formula: '.$cellDataFormula.'<br />';
+ }
+
+ $colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
+ $cellDataTableAttributes['number-columns-repeated'] : 1;
+ if ($type !== NULL) {
+ for ($i = 0; $i < $colRepeats; ++$i) {
+ if ($i > 0) {
+ ++$columnID;
+ }
+ if ($type !== PHPExcel_Cell_DataType::TYPE_NULL) {
+ for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
+ $rID = $rowID + $rowAdjust;
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
+ if ($hasCalculatedValue) {
+// echo 'Forumla result is '.$dataValue.'<br />';
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
+ }
+ if ($formatting !== NULL) {
+ $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
+ } else {
+ $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
+ }
+ if ($hyperlink !== NULL) {
+ $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
+ }
+ }
+ }
+ }
+ }
+
+ // Merged cells
+ if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
+ if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->_readDataOnly)) {
+ $columnTo = $columnID;
+ if (isset($cellDataTableAttributes['number-columns-spanned'])) {
+ $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+ }
+ $rowTo = $rowID;
+ if (isset($cellDataTableAttributes['number-rows-spanned'])) {
+ $rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
+ }
+ $cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
+ $objPHPExcel->getActiveSheet()->mergeCells($cellRange);
+ }
+ }
+
+ ++$columnID;
+ }
+ $rowID += $rowRepeats;
+ break;
+ }
+ }
+ ++$worksheetID;
+ }
+ }
+
+ // Return
+ return $objPHPExcel;
+ }
+
+
+ private function _parseRichText($is = '') {
+ $value = new PHPExcel_RichText();
+
+ $value->createText($is);
+
+ return $value;
+ }
+
+}
diff --cc 3rdparty/Sabre/DAV/Client.php
index 9850bfe,0000000..185d985
mode 100644,000000..100644
--- a/3rdparty/Sabre/DAV/Client.php
+++ b/3rdparty/Sabre/DAV/Client.php
@@@ -1,567 -1,0 +1,568 @@@
+<?php
+
+/**
+ * SabreDAV DAV client
+ *
+ * This client wraps around Curl to provide a convenient API to a WebDAV
+ * server.
+ *
+ * NOTE: This class is experimental, it's api will likely change in the future.
+ *
+ * @package Sabre
+ * @subpackage DAVClient
+ * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Client {
+
+ /**
+ * The propertyMap is a key-value array.
+ *
+ * If you use the propertyMap, any {DAV:}multistatus responses with the
+ * proeprties listed in this array, will automatically be mapped to a
+ * respective class.
+ *
+ * The {DAV:}resourcetype property is automatically added. This maps to
+ * Sabre_DAV_Property_ResourceType
+ *
+ * @var array
+ */
+ public $propertyMap = array();
+
+ protected $baseUri;
+ protected $userName;
+ protected $password;
+ protected $proxy;
+ protected $trustedCertificates;
+
+ /**
+ * Basic authentication
+ */
+ const AUTH_BASIC = 1;
+
+ /**
+ * Digest authentication
+ */
+ const AUTH_DIGEST = 2;
+
+ /**
+ * The authentication type we're using.
+ *
+ * This is a bitmask of AUTH_BASIC and AUTH_DIGEST.
+ *
+ * If DIGEST is used, the client makes 1 extra request per request, to get
+ * the authentication tokens.
+ *
+ * @var int
+ */
+ protected $authType;
+
+ /**
+ * Indicates if SSL verification is enabled or not.
+ *
+ * @var boolean
+ */
+ private $verifyPeer;
+
+ /**
+ * Constructor
+ *
+ * Settings are provided through the 'settings' argument. The following
+ * settings are supported:
+ *
+ * * baseUri
+ * * userName (optional)
+ * * password (optional)
+ * * proxy (optional)
+ *
+ * @param array $settings
+ */
+ public function __construct(array $settings) {
+
+ if (!isset($settings['baseUri'])) {
+ throw new InvalidArgumentException('A baseUri must be provided');
+ }
+
+ $validSettings = array(
+ 'baseUri',
+ 'userName',
+ 'password',
+ 'proxy',
+ );
+
+ foreach($validSettings as $validSetting) {
+ if (isset($settings[$validSetting])) {
+ $this->$validSetting = $settings[$validSetting];
+ }
+ }
+
+ if (isset($settings['authType'])) {
+ $this->authType = $settings['authType'];
+ } else {
+ $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
+ }
+
+ $this->propertyMap['{DAV:}resourcetype'] = 'Sabre_DAV_Property_ResourceType';
+
+ }
+
+ /**
+ * Add trusted root certificates to the webdav client.
+ *
+ * The parameter certificates should be a absolute path to a file
+ * which contains all trusted certificates
+ *
+ * @param string $certificates
+ */
+ public function addTrustedCertificates($certificates) {
+ $this->trustedCertificates = $certificates;
+ }
+
+ /**
+ * Enables/disables SSL peer verification
+ *
+ * @param boolean $value
+ */
+ public function setVerifyPeer($value) {
+ $this->verifyPeer = $value;
+ }
+
+ /**
+ * Does a PROPFIND request
+ *
+ * The list of requested properties must be specified as an array, in clark
+ * notation.
+ *
+ * The returned array will contain a list of filenames as keys, and
+ * properties as values.
+ *
+ * The properties array will contain the list of properties. Only properties
+ * that are actually returned from the server (without error) will be
+ * returned, anything else is discarded.
+ *
+ * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+ * made to the server to also return all child resources.
+ *
+ * @param string $url
+ * @param array $properties
+ * @param int $depth
+ * @return array
+ */
+ public function propFind($url, array $properties, $depth = 0) {
+
+ $body = '<?xml version="1.0"?>' . "\n";
+ $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
+ $body.= ' <d:prop>' . "\n";
+
+ foreach($properties as $property) {
+
+ list(
+ $namespace,
+ $elementName
+ ) = Sabre_DAV_XMLUtil::parseClarkNotation($property);
+
+ if ($namespace === 'DAV:') {
+ $body.=' <d:' . $elementName . ' />' . "\n";
+ } else {
+ $body.=" <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+ }
+
+ }
+
+ $body.= ' </d:prop>' . "\n";
+ $body.= '</d:propfind>';
+
+ $response = $this->request('PROPFIND', $url, $body, array(
+ 'Depth' => $depth,
+ 'Content-Type' => 'application/xml'
+ ));
+
+ $result = $this->parseMultiStatus($response['body']);
+
+ // If depth was 0, we only return the top item
+ if ($depth===0) {
+ reset($result);
+ $result = current($result);
+ return isset($result[200])?$result[200]:array();
+ }
+
+ $newResult = array();
+ foreach($result as $href => $statusList) {
+
+ $newResult[$href] = isset($statusList[200])?$statusList[200]:array();
+
+ }
+
+ return $newResult;
+
+ }
+
+ /**
+ * Updates a list of properties on the server
+ *
+ * The list of properties must have clark-notation properties for the keys,
+ * and the actual (string) value for the value. If the value is null, an
+ * attempt is made to delete the property.
+ *
+ * @todo Must be building the request using the DOM, and does not yet
+ * support complex properties.
+ * @param string $url
+ * @param array $properties
+ * @return void
+ */
+ public function propPatch($url, array $properties) {
+
+ $body = '<?xml version="1.0"?>' . "\n";
+ $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
+
+ foreach($properties as $propName => $propValue) {
+
+ list(
+ $namespace,
+ $elementName
+ ) = Sabre_DAV_XMLUtil::parseClarkNotation($propName);
+
+ if ($propValue === null) {
+
+ $body.="<d:remove><d:prop>\n";
+
+ if ($namespace === 'DAV:') {
+ $body.=' <d:' . $elementName . ' />' . "\n";
+ } else {
+ $body.=" <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
+ }
+
+ $body.="</d:prop></d:remove>\n";
+
+ } else {
+
+ $body.="<d:set><d:prop>\n";
+ if ($namespace === 'DAV:') {
+ $body.=' <d:' . $elementName . '>';
+ } else {
+ $body.=" <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
+ }
+ // Shitty.. i know
+ $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
+ if ($namespace === 'DAV:') {
+ $body.='</d:' . $elementName . '>' . "\n";
+ } else {
+ $body.="</x:" . $elementName . ">\n";
+ }
+ $body.="</d:prop></d:set>\n";
+
+ }
+
+ }
+
+ $body.= '</d:propertyupdate>';
+
+ $this->request('PROPPATCH', $url, $body, array(
+ 'Content-Type' => 'application/xml'
+ ));
+
+ }
+
+ /**
+ * Performs an HTTP options request
+ *
+ * This method returns all the features from the 'DAV:' header as an array.
+ * If there was no DAV header, or no contents this method will return an
+ * empty array.
+ *
+ * @return array
+ */
+ public function options() {
+
+ $result = $this->request('OPTIONS');
+ if (!isset($result['headers']['dav'])) {
+ return array();
+ }
+
+ $features = explode(',', $result['headers']['dav']);
+ foreach($features as &$v) {
+ $v = trim($v);
+ }
+ return $features;
+
+ }
+
+ /**
+ * Performs an actual HTTP request, and returns the result.
+ *
+ * If the specified url is relative, it will be expanded based on the base
+ * url.
+ *
+ * The returned array contains 3 keys:
+ * * body - the response body
+ * * httpCode - a HTTP code (200, 404, etc)
+ * * headers - a list of response http headers. The header names have
+ * been lowercased.
+ *
+ * @param string $method
+ * @param string $url
+ * @param string $body
+ * @param array $headers
+ * @return array
+ */
+ public function request($method, $url = '', $body = null, $headers = array()) {
+
+ $url = $this->getAbsoluteUrl($url);
+
+ $curlSettings = array(
+ CURLOPT_RETURNTRANSFER => true,
+ // Return headers as part of the response
+ CURLOPT_HEADER => true,
+ // For security we cast this to a string. If somehow an array could
+ // be passed here, it would be possible for an attacker to use @ to
+ // post local files.
+ CURLOPT_POSTFIELDS => (string)$body,
+ // Automatically follow redirects
+ CURLOPT_FOLLOWLOCATION => true,
+ CURLOPT_MAXREDIRS => 5,
+ );
+
+ if($this->verifyPeer !== null) {
+ $curlSettings[CURLOPT_SSL_VERIFYPEER] = $this->verifyPeer;
+ }
+
+ if($this->trustedCertificates) {
+ $curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
+ }
+
+ switch ($method) {
+ case 'HEAD' :
+
+ // do not read body with HEAD requests (this is necessary because cURL does not ignore the body with HEAD
+ // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
+ // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
+ // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
+ // response body
+ $curlSettings[CURLOPT_NOBODY] = true;
+ $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+ break;
+
+ default:
+ $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
+ break;
+
+ }
+
+ // Adding HTTP headers
+ $nHeaders = array();
+ foreach($headers as $key=>$value) {
+
+ $nHeaders[] = $key . ': ' . $value;
+
+ }
+ $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
+
+ if ($this->proxy) {
+ $curlSettings[CURLOPT_PROXY] = $this->proxy;
+ }
+
+ if ($this->userName && $this->authType) {
+ $curlType = 0;
+ if ($this->authType & self::AUTH_BASIC) {
+ $curlType |= CURLAUTH_BASIC;
+ }
+ if ($this->authType & self::AUTH_DIGEST) {
+ $curlType |= CURLAUTH_DIGEST;
+ }
+ $curlSettings[CURLOPT_HTTPAUTH] = $curlType;
+ $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
+ }
+
+ list(
+ $response,
+ $curlInfo,
+ $curlErrNo,
+ $curlError
+ ) = $this->curlRequest($url, $curlSettings);
+
+ $headerBlob = substr($response, 0, $curlInfo['header_size']);
+ $response = substr($response, $curlInfo['header_size']);
+
+ // In the case of 100 Continue, or redirects we'll have multiple lists
+ // of headers for each separate HTTP response. We can easily split this
+ // because they are separated by \r\n\r\n
+ $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+
+ // We only care about the last set of headers
+ $headerBlob = $headerBlob[count($headerBlob)-1];
+
+ // Splitting headers
+ $headerBlob = explode("\r\n", $headerBlob);
+
+ $headers = array();
+ foreach($headerBlob as $header) {
+ $parts = explode(':', $header, 2);
+ if (count($parts)==2) {
+ $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
+ }
+ }
+
+ $response = array(
+ 'body' => $response,
+ 'statusCode' => $curlInfo['http_code'],
+ 'headers' => $headers
+ );
+
+ if ($curlErrNo) {
+ throw new Sabre_DAV_Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
+ }
+
+ if ($response['statusCode']>=400) {
+ switch ($response['statusCode']) {
+ case 400 :
+ throw new Sabre_DAV_Exception_BadRequest('Bad request');
+ case 401 :
+ throw new Sabre_DAV_Exception_NotAuthenticated('Not authenticated');
+ case 402 :
+ throw new Sabre_DAV_Exception_PaymentRequired('Payment required');
+ case 403 :
+ throw new Sabre_DAV_Exception_Forbidden('Forbidden');
+ case 404:
+ throw new Sabre_DAV_Exception_NotFound('Resource not found.');
+ case 405 :
+ throw new Sabre_DAV_Exception_MethodNotAllowed('Method not allowed');
+ case 409 :
+ throw new Sabre_DAV_Exception_Conflict('Conflict');
+ case 412 :
+ throw new Sabre_DAV_Exception_PreconditionFailed('Precondition failed');
+ case 416 :
+ throw new Sabre_DAV_Exception_RequestedRangeNotSatisfiable('Requested Range Not Satisfiable');
+ case 500 :
+ throw new Sabre_DAV_Exception('Internal server error');
+ case 501 :
+ throw new Sabre_DAV_Exception_NotImplemented('Not Implemented');
+ case 507 :
+ throw new Sabre_DAV_Exception_InsufficientStorage('Insufficient storage');
+ default:
+ throw new Sabre_DAV_Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
+ }
+ }
+
+ return $response;
+
+ }
+
+ /**
+ * Wrapper for all curl functions.
+ *
+ * The only reason this was split out in a separate method, is so it
+ * becomes easier to unittest.
+ *
+ * @param string $url
+ * @param array $settings
+ * @return array
+ */
+ // @codeCoverageIgnoreStart
+ protected function curlRequest($url, $settings) {
+
+ $curl = curl_init($url);
+ curl_setopt_array($curl, $settings);
+
+ return array(
+ curl_exec($curl),
+ curl_getinfo($curl),
+ curl_errno($curl),
+ curl_error($curl)
+ );
+
+ }
+ // @codeCoverageIgnoreEnd
+
+ /**
+ * Returns the full url based on the given url (which may be relative). All
+ * urls are expanded based on the base url as given by the server.
+ *
+ * @param string $url
+ * @return string
+ */
+ protected function getAbsoluteUrl($url) {
+
+ // If the url starts with http:// or https://, the url is already absolute.
+ if (preg_match('/^http(s?):\/\//', $url)) {
+ return $url;
+ }
+
+ // If the url starts with a slash, we must calculate the url based off
+ // the root of the base url.
+ if (strpos($url,'/') === 0) {
+ $parts = parse_url($this->baseUri);
+ return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
+ }
+
+ // Otherwise...
+ return $this->baseUri . $url;
+
+ }
+
+ /**
+ * Parses a WebDAV multistatus response body
+ *
+ * This method returns an array with the following structure
+ *
+ * array(
+ * 'url/to/resource' => array(
+ * '200' => array(
+ * '{DAV:}property1' => 'value1',
+ * '{DAV:}property2' => 'value2',
+ * ),
+ * '404' => array(
+ * '{DAV:}property1' => null,
+ * '{DAV:}property2' => null,
+ * ),
+ * )
+ * 'url/to/resource2' => array(
+ * .. etc ..
+ * )
+ * )
+ *
+ *
+ * @param string $body xml body
+ * @return array
+ */
+ public function parseMultiStatus($body) {
+
+ $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
+
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
++ libxml_disable_entity_loader($loadEntities);
+ if ($responseXML===false) {
+ throw new InvalidArgumentException('The passed data is not valid XML');
+ }
+
+ $responseXML->registerXPathNamespace('d', 'urn:DAV');
+
+ $propResult = array();
+
+ foreach($responseXML->xpath('d:response') as $response) {
+ $response->registerXPathNamespace('d', 'urn:DAV');
+ $href = $response->xpath('d:href');
+ $href = (string)$href[0];
+
+ $properties = array();
+
+ foreach($response->xpath('d:propstat') as $propStat) {
+
+ $propStat->registerXPathNamespace('d', 'urn:DAV');
+ $status = $propStat->xpath('d:status');
+ list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
+
+ $properties[$statusCode] = Sabre_DAV_XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
+
+ }
+
+ $propResult[$href] = $properties;
+
+ }
+
+ return $propResult;
+
+ }
+
+}
diff --cc 3rdparty/Sabre/DAV/Locks/Plugin.php
index e7fab2b,0000000..4cbf6ef
mode 100644,000000..100644
--- a/3rdparty/Sabre/DAV/Locks/Plugin.php
+++ b/3rdparty/Sabre/DAV/Locks/Plugin.php
@@@ -1,640 -1,0 +1,641 @@@
+<?php
+
+/**
+ * Locking plugin
+ *
+ * This plugin provides locking support to a WebDAV server.
+ * The easiest way to get started, is by hooking it up as such:
+ *
+ * $lockBackend = new Sabre_DAV_Locks_Backend_File('./mylockdb');
+ * $lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
+ * $server->addPlugin($lockPlugin);
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
+
+ /**
+ * locksBackend
+ *
+ * @var Sabre_DAV_Locks_Backend_Abstract
+ */
+ protected $locksBackend;
+
+ /**
+ * server
+ *
+ * @var Sabre_DAV_Server
+ */
+ protected $server;
+
+ /**
+ * __construct
+ *
+ * @param Sabre_DAV_Locks_Backend_Abstract $locksBackend
+ */
+ public function __construct(Sabre_DAV_Locks_Backend_Abstract $locksBackend = null) {
+
+ $this->locksBackend = $locksBackend;
+
+ }
+
+ /**
+ * Initializes the plugin
+ *
+ * This method is automatically called by the Server class after addPlugin.
+ *
+ * @param Sabre_DAV_Server $server
+ * @return void
+ */
+ public function initialize(Sabre_DAV_Server $server) {
+
+ $this->server = $server;
+ $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
+ $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
+ $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
+
+ }
+
+ /**
+ * Returns a plugin name.
+ *
+ * Using this name other plugins will be able to access other plugins
+ * using Sabre_DAV_Server::getPlugin
+ *
+ * @return string
+ */
+ public function getPluginName() {
+
+ return 'locks';
+
+ }
+
+ /**
+ * This method is called by the Server if the user used an HTTP method
+ * the server didn't recognize.
+ *
+ * This plugin intercepts the LOCK and UNLOCK methods.
+ *
+ * @param string $method
+ * @param string $uri
+ * @return bool
+ */
+ public function unknownMethod($method, $uri) {
+
+ switch($method) {
+
+ case 'LOCK' : $this->httpLock($uri); return false;
+ case 'UNLOCK' : $this->httpUnlock($uri); return false;
+
+ }
+
+ }
+
+ /**
+ * This method is called after most properties have been found
+ * it allows us to add in any Lock-related properties
+ *
+ * @param string $path
+ * @param array $newProperties
+ * @return bool
+ */
+ public function afterGetProperties($path, &$newProperties) {
+
+ foreach($newProperties[404] as $propName=>$discard) {
+
+ switch($propName) {
+
+ case '{DAV:}supportedlock' :
+ $val = false;
+ if ($this->locksBackend) $val = true;
+ $newProperties[200][$propName] = new Sabre_DAV_Property_SupportedLock($val);
+ unset($newProperties[404][$propName]);
+ break;
+
+ case '{DAV:}lockdiscovery' :
+ $newProperties[200][$propName] = new Sabre_DAV_Property_LockDiscovery($this->getLocks($path));
+ unset($newProperties[404][$propName]);
+ break;
+
+ }
+
+
+ }
+ return true;
+
+ }
+
+
+ /**
+ * This method is called before the logic for any HTTP method is
+ * handled.
+ *
+ * This plugin uses that feature to intercept access to locked resources.
+ *
+ * @param string $method
+ * @param string $uri
+ * @return bool
+ */
+ public function beforeMethod($method, $uri) {
+
+ switch($method) {
+
+ case 'DELETE' :
+ $lastLock = null;
+ if (!$this->validateLock($uri,$lastLock, true))
+ throw new Sabre_DAV_Exception_Locked($lastLock);
+ break;
+ case 'MKCOL' :
+ case 'PROPPATCH' :
+ case 'PUT' :
+ case 'PATCH' :
+ $lastLock = null;
+ if (!$this->validateLock($uri,$lastLock))
+ throw new Sabre_DAV_Exception_Locked($lastLock);
+ break;
+ case 'MOVE' :
+ $lastLock = null;
+ if (!$this->validateLock(array(
+ $uri,
+ $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+ ),$lastLock, true))
+ throw new Sabre_DAV_Exception_Locked($lastLock);
+ break;
+ case 'COPY' :
+ $lastLock = null;
+ if (!$this->validateLock(
+ $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
+ $lastLock, true))
+ throw new Sabre_DAV_Exception_Locked($lastLock);
+ break;
+ }
+
+ return true;
+
+ }
+
+ /**
+ * Use this method to tell the server this plugin defines additional
+ * HTTP methods.
+ *
+ * This method is passed a uri. It should only return HTTP methods that are
+ * available for the specified uri.
+ *
+ * @param string $uri
+ * @return array
+ */
+ public function getHTTPMethods($uri) {
+
+ if ($this->locksBackend)
+ return array('LOCK','UNLOCK');
+
+ return array();
+
+ }
+
+ /**
+ * Returns a list of features for the HTTP OPTIONS Dav: header.
+ *
+ * In this case this is only the number 2. The 2 in the Dav: header
+ * indicates the server supports locks.
+ *
+ * @return array
+ */
+ public function getFeatures() {
+
+ return array(2);
+
+ }
+
+ /**
+ * Returns all lock information on a particular uri
+ *
+ * This function should return an array with Sabre_DAV_Locks_LockInfo objects. If there are no locks on a file, return an empty array.
+ *
+ * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
+ * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
+ * for any possible locks and return those as well.
+ *
+ * @param string $uri
+ * @param bool $returnChildLocks
+ * @return array
+ */
+ public function getLocks($uri, $returnChildLocks = false) {
+
+ $lockList = array();
+
+ if ($this->locksBackend)
+ $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
+
+ return $lockList;
+
+ }
+
+ /**
+ * Locks an uri
+ *
+ * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
+ * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
+ * of lock (shared or exclusive) and the owner of the lock
+ *
+ * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
+ *
+ * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
+ *
+ * @param string $uri
+ * @return void
+ */
+ protected function httpLock($uri) {
+
+ $lastLock = null;
+ if (!$this->validateLock($uri,$lastLock)) {
+
+ // If the existing lock was an exclusive lock, we need to fail
+ if (!$lastLock || $lastLock->scope == Sabre_DAV_Locks_LockInfo::EXCLUSIVE) {
+ //var_dump($lastLock);
+ throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+ }
+
+ }
+
+ if ($body = $this->server->httpRequest->getBody(true)) {
+ // This is a new lock request
+ $lockInfo = $this->parseLockRequest($body);
+ $lockInfo->depth = $this->server->getHTTPDepth();
+ $lockInfo->uri = $uri;
+ if($lastLock && $lockInfo->scope != Sabre_DAV_Locks_LockInfo::SHARED) throw new Sabre_DAV_Exception_ConflictingLock($lastLock);
+
+ } elseif ($lastLock) {
+
+ // This must have been a lock refresh
+ $lockInfo = $lastLock;
+
+ // The resource could have been locked through another uri.
+ if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
+
+ } else {
+
+ // There was neither a lock refresh nor a new lock request
+ throw new Sabre_DAV_Exception_BadRequest('An xml body is required for lock requests');
+
+ }
+
+ if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
+
+ $newFile = false;
+
+ // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
+ try {
+ $this->server->tree->getNodeForPath($uri);
+
+ // We need to call the beforeWriteContent event for RFC3744
+ // Edit: looks like this is not used, and causing problems now.
+ //
+ // See Issue 222
+ // $this->server->broadcastEvent('beforeWriteContent',array($uri));
+
+ } catch (Sabre_DAV_Exception_NotFound $e) {
+
+ // It didn't, lets create it
+ $this->server->createFile($uri,fopen('php://memory','r'));
+ $newFile = true;
+
+ }
+
+ $this->lockNode($uri,$lockInfo);
+
+ $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
+ $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
+ $this->server->httpResponse->sendStatus($newFile?201:200);
+ $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
+
+ }
+
+ /**
+ * Unlocks a uri
+ *
+ * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
+ * The server should return 204 (No content) on success
+ *
+ * @param string $uri
+ * @return void
+ */
+ protected function httpUnlock($uri) {
+
+ $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
+
+ // If the locktoken header is not supplied, we need to throw a bad request exception
+ if (!$lockToken) throw new Sabre_DAV_Exception_BadRequest('No lock token was supplied');
+
+ $locks = $this->getLocks($uri);
+
+ // Windows sometimes forgets to include < and > in the Lock-Token
+ // header
+ if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
+
+ foreach($locks as $lock) {
+
+ if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
+
+ $this->unlockNode($uri,$lock);
+ $this->server->httpResponse->setHeader('Content-Length','0');
+ $this->server->httpResponse->sendStatus(204);
+ return;
+
+ }
+
+ }
+
+ // If we got here, it means the locktoken was invalid
+ throw new Sabre_DAV_Exception_LockTokenMatchesRequestUri();
+
+ }
+
+ /**
+ * Locks a uri
+ *
+ * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
+ * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
+ *
+ * @param string $uri
+ * @param Sabre_DAV_Locks_LockInfo $lockInfo
+ * @return bool
+ */
+ public function lockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+ if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
+
+ if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
+ throw new Sabre_DAV_Exception_MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
+
+ }
+
+ /**
+ * Unlocks a uri
+ *
+ * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
+ *
+ * @param string $uri
+ * @param Sabre_DAV_Locks_LockInfo $lockInfo
+ * @return bool
+ */
+ public function unlockNode($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+ if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
+ if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
+
+ }
+
+
+ /**
+ * Returns the contents of the HTTP Timeout header.
+ *
+ * The method formats the header into an integer.
+ *
+ * @return int
+ */
+ public function getTimeoutHeader() {
+
+ $header = $this->server->httpRequest->getHeader('Timeout');
+
+ if ($header) {
+
+ if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
+ else if (strtolower($header)=='infinite') $header=Sabre_DAV_Locks_LockInfo::TIMEOUT_INFINITE;
+ else throw new Sabre_DAV_Exception_BadRequest('Invalid HTTP timeout header');
+
+ } else {
+
+ $header = 0;
+
+ }
+
+ return $header;
+
+ }
+
+ /**
+ * Generates the response for successful LOCK requests
+ *
+ * @param Sabre_DAV_Locks_LockInfo $lockInfo
+ * @return string
+ */
+ protected function generateLockResponse(Sabre_DAV_Locks_LockInfo $lockInfo) {
+
+ $dom = new DOMDocument('1.0','utf-8');
+ $dom->formatOutput = true;
+
+ $prop = $dom->createElementNS('DAV:','d:prop');
+ $dom->appendChild($prop);
+
+ $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
+ $prop->appendChild($lockDiscovery);
+
+ $lockObj = new Sabre_DAV_Property_LockDiscovery(array($lockInfo),true);
+ $lockObj->serialize($this->server,$lockDiscovery);
+
+ return $dom->saveXML();
+
+ }
+
+ /**
+ * validateLock should be called when a write operation is about to happen
+ * It will check if the requested url is locked, and see if the correct lock tokens are passed
+ *
+ * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
+ * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre_DAV_Locks_LockInfo)
+ * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
+ * @return bool
+ */
+ protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
+
+ if (is_null($urls)) {
+ $urls = array($this->server->getRequestUri());
+ } elseif (is_string($urls)) {
+ $urls = array($urls);
+ } elseif (!is_array($urls)) {
+ throw new Sabre_DAV_Exception('The urls parameter should either be null, a string or an array');
+ }
+
+ $conditions = $this->getIfConditions();
+
+ // We're going to loop through the urls and make sure all lock conditions are satisfied
+ foreach($urls as $url) {
+
+ $locks = $this->getLocks($url, $checkChildLocks);
+
+ // If there were no conditions, but there were locks, we fail
+ if (!$conditions && $locks) {
+ reset($locks);
+ $lastLock = current($locks);
+ return false;
+ }
+
+ // If there were no locks or conditions, we go to the next url
+ if (!$locks && !$conditions) continue;
+
+ foreach($conditions as $condition) {
+
+ if (!$condition['uri']) {
+ $conditionUri = $this->server->getRequestUri();
+ } else {
+ $conditionUri = $this->server->calculateUri($condition['uri']);
+ }
+
+ // If the condition has a url, and it isn't part of the affected url at all, check the next condition
+ if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
+
+ // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
+ // At least 1 condition has to be satisfied
+ foreach($condition['tokens'] as $conditionToken) {
+
+ $etagValid = true;
+ $lockValid = true;
+
+ // key 2 can contain an etag
+ if ($conditionToken[2]) {
+
+ $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
+ $node = $this->server->tree->getNodeForPath($uri);
+ $etagValid = $node->getETag()==$conditionToken[2];
+
+ }
+
+ // key 1 can contain a lock token
+ if ($conditionToken[1]) {
+
+ $lockValid = false;
+ // Match all the locks
+ foreach($locks as $lockIndex=>$lock) {
+
+ $lockToken = 'opaquelocktoken:' . $lock->token;
+
+ // Checking NOT
+ if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
+
+ // Condition valid, onto the next
+ $lockValid = true;
+ break;
+ }
+ if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
+
+ $lastLock = $lock;
+ // Condition valid and lock matched
+ unset($locks[$lockIndex]);
+ $lockValid = true;
+ break;
+
+ }
+
+ }
+
+ }
+
+ // If, after checking both etags and locks they are stil valid,
+ // we can continue with the next condition.
+ if ($etagValid && $lockValid) continue 2;
+ }
+ // No conditions matched, so we fail
+ throw new Sabre_DAV_Exception_PreconditionFailed('The tokens provided in the if header did not match','If');
+ }
+
+ // Conditions were met, we'll also need to check if all the locks are gone
+ if (count($locks)) {
+
+ reset($locks);
+
+ // There's still locks, we fail
+ $lastLock = current($locks);
+ return false;
+
+ }
+
+
+ }
+
+ // We got here, this means every condition was satisfied
+ return true;
+
+ }
+
+ /**
+ * This method is created to extract information from the WebDAV HTTP 'If:' header
+ *
+ * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
+ * The function will return an array, containing structs with the following keys
+ *
+ * * uri - the uri the condition applies to. If this is returned as an
+ * empty string, this implies it's referring to the request url.
+ * * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
+ * * etag - an etag, if supplied
+ *
+ * @return array
+ */
+ public function getIfConditions() {
+
+ $header = $this->server->httpRequest->getHeader('If');
+ if (!$header) return array();
+
+ $matches = array();
+
+ $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
+ preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
+
+ $conditions = array();
+
+ foreach($matches as $match) {
+
+ $condition = array(
+ 'uri' => $match['uri'],
+ 'tokens' => array(
+ array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
+ ),
+ );
+
+ if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
+ $match['not']?0:1,
+ $match['token'],
+ isset($match['etag'])?$match['etag']:''
+ );
+ else {
+ $conditions[] = $condition;
+ }
+
+ }
+
+ return $conditions;
+
+ }
+
+ /**
+ * Parses a webdav lock xml body, and returns a new Sabre_DAV_Locks_LockInfo object
+ *
+ * @param string $body
+ * @return Sabre_DAV_Locks_LockInfo
+ */
+ protected function parseLockRequest($body) {
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xml = simplexml_load_string(
+ Sabre_DAV_XMLUtil::convertDAVNamespace($body),
+ null,
+ LIBXML_NOWARNING);
++ libxml_disable_entity_loader($loadEntities);
+ $xml->registerXPathNamespace('d','urn:DAV');
+ $lockInfo = new Sabre_DAV_Locks_LockInfo();
+
+ $children = $xml->children("urn:DAV");
+ $lockInfo->owner = (string)$children->owner;
+
+ $lockInfo->token = Sabre_DAV_UUIDUtil::getUUID();
+ $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0?Sabre_DAV_Locks_LockInfo::EXCLUSIVE:Sabre_DAV_Locks_LockInfo::SHARED;
+
+ return $lockInfo;
+
+ }
+
+
+}
diff --cc 3rdparty/Sabre/DAV/XMLUtil.php
index faa3f3a,0000000..cfca9a8
mode 100644,000000..100644
--- a/3rdparty/Sabre/DAV/XMLUtil.php
+++ b/3rdparty/Sabre/DAV/XMLUtil.php
@@@ -1,188 -1,0 +1,189 @@@
+<?php
+
+/**
+ * XML utilities for WebDAV
+ *
+ * @package Sabre
+ * @subpackage DAV
+ * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class Sabre_DAV_XMLUtil {
+
+ /**
+ * Returns the 'clark notation' for an element.
+ *
+ * For example, and element encoded as:
+ * <b:myelem xmlns:b="http://www.example.org/" />
+ * will be returned as:
+ * {http://www.example.org}myelem
+ *
+ * This format is used throughout the SabreDAV sourcecode.
+ * Elements encoded with the urn:DAV namespace will
+ * be returned as if they were in the DAV: namespace. This is to avoid
+ * compatibility problems.
+ *
+ * This function will return null if a nodetype other than an Element is passed.
+ *
+ * @param DOMNode $dom
+ * @return string
+ */
+ static function toClarkNotation(DOMNode $dom) {
+
+ if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
+
+ // Mapping back to the real namespace, in case it was dav
+ if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+
+ // Mapping to clark notation
+ return '{' . $ns . '}' . $dom->localName;
+
+ }
+
+ /**
+ * Parses a clark-notation string, and returns the namespace and element
+ * name components.
+ *
+ * If the string was invalid, it will throw an InvalidArgumentException.
+ *
+ * @param string $str
+ * @throws InvalidArgumentException
+ * @return array
+ */
+ static function parseClarkNotation($str) {
+
+ if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
+ throw new InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
+ }
+
+ return array(
+ $matches[1],
+ $matches[2]
+ );
+
+ }
+
+ /**
+ * This method takes an XML document (as string) and converts all instances of the
+ * DAV: namespace to urn:DAV
+ *
+ * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
+ * spec, and causes the DOM to throw errors
+ *
+ * @param string $xmlDocument
+ * @return array|string|null
+ */
+ static function convertDAVNamespace($xmlDocument) {
+
+ // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
+ // namespace is actually a violation of the XML namespaces specification, and will cause errors
+ return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
+
+ }
+
+ /**
+ * This method provides a generic way to load a DOMDocument for WebDAV use.
+ *
+ * This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
+ * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
+ *
+ * @param string $xml
+ * @throws Sabre_DAV_Exception_BadRequest
+ * @return DOMDocument
+ */
+ static function loadDOMDocument($xml) {
+
+ if (empty($xml))
+ throw new Sabre_DAV_Exception_BadRequest('Empty XML document sent');
+
+ // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
+ // does not support this, so we must intercept this and convert to UTF-8.
+ if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
+
+ // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
+ $xml = iconv('UTF-16LE','UTF-8',$xml);
+
+ // Because the xml header might specify the encoding, we must also change this.
+ // This regex looks for the string encoding="UTF-16" and replaces it with
+ // encoding="UTF-8".
+ $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
+
+ }
+
+ // Retaining old error setting
+ $oldErrorSetting = libxml_use_internal_errors(true);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+
+ // Clearing any previous errors
+ libxml_clear_errors();
+
+ $dom = new DOMDocument();
+
+ // We don't generally care about any whitespace
+ $dom->preserveWhiteSpace = false;
+
+ $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_DTDLOAD | LIBXML_DTDATTR);
++ libxml_disable_entity_loader($loadEntities);
+
+ if ($error = libxml_get_last_error()) {
+ libxml_clear_errors();
+ throw new Sabre_DAV_Exception_BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
+ }
+
+ // Restoring old mechanism for error handling
+ if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+
+ return $dom;
+
+ }
+
+ /**
+ * Parses all WebDAV properties out of a DOM Element
+ *
+ * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
+ * method helps by going through all these and pulling out the actual
+ * propertynames, making them array keys and making the property values,
+ * well.. the array values.
+ *
+ * If no value was given (self-closing element) null will be used as the
+ * value. This is used in for example PROPFIND requests.
+ *
+ * Complex values are supported through the propertyMap argument. The
+ * propertyMap should have the clark-notation properties as it's keys, and
+ * classnames as values.
+ *
+ * When any of these properties are found, the unserialize() method will be
+ * (statically) called. The result of this method is used as the value.
+ *
+ * @param DOMElement $parentNode
+ * @param array $propertyMap
+ * @return array
+ */
+ static function parseProperties(DOMElement $parentNode, array $propertyMap = array()) {
+
+ $propList = array();
+ foreach($parentNode->childNodes as $propNode) {
+
+ if (Sabre_DAV_XMLUtil::toClarkNotation($propNode)!=='{DAV:}prop') continue;
+
+ foreach($propNode->childNodes as $propNodeData) {
+
+ /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+ if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+ $propertyName = Sabre_DAV_XMLUtil::toClarkNotation($propNodeData);
+ if (isset($propertyMap[$propertyName])) {
+ $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
+ } else {
+ $propList[$propertyName] = $propNodeData->textContent;
+ }
+ }
+
+
+ }
+ return $propList;
+
+ }
+
+}
diff --cc 3rdparty/getid3/getid3.lib.php
index b7d05b3,0000000..74d2017
mode 100644,000000..100644
--- a/3rdparty/getid3/getid3.lib.php
+++ b/3rdparty/getid3/getid3.lib.php
@@@ -1,1343 -1,0 +1,1344 @@@
+<?php
+/////////////////////////////////////////////////////////////////
+/// getID3() by James Heinrich <info at getid3.org> //
+// available at http://getid3.sourceforge.net //
+// or http://www.getid3.org //
+/////////////////////////////////////////////////////////////////
+// //
+// getid3.lib.php - part of getID3() //
+// See readme.txt for more details //
+// ///
+/////////////////////////////////////////////////////////////////
+
+
+class getid3_lib
+{
+
+ public static function PrintHexBytes($string, $hex=true, $spaces=true, $htmlencoding='UTF-8') {
+ $returnstring = '';
+ for ($i = 0; $i < strlen($string); $i++) {
+ if ($hex) {
+ $returnstring .= str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
+ } else {
+ $returnstring .= ' '.(preg_match("#[\x20-\x7E]#", $string{$i}) ? $string{$i} : '�');
+ }
+ if ($spaces) {
+ $returnstring .= ' ';
+ }
+ }
+ if (!empty($htmlencoding)) {
+ if ($htmlencoding === true) {
+ $htmlencoding = 'UTF-8'; // prior to getID3 v1.9.0 the function's 4th parameter was boolean
+ }
+ $returnstring = htmlentities($returnstring, ENT_QUOTES, $htmlencoding);
+ }
+ return $returnstring;
+ }
+
+ public static function trunc($floatnumber) {
+ // truncates a floating-point number at the decimal point
+ // returns int (if possible, otherwise float)
+ if ($floatnumber >= 1) {
+ $truncatednumber = floor($floatnumber);
+ } elseif ($floatnumber <= -1) {
+ $truncatednumber = ceil($floatnumber);
+ } else {
+ $truncatednumber = 0;
+ }
+ if (self::intValueSupported($truncatednumber)) {
+ $truncatednumber = (int) $truncatednumber;
+ }
+ return $truncatednumber;
+ }
+
+
+ public static function safe_inc(&$variable, $increment=1) {
+ if (isset($variable)) {
+ $variable += $increment;
+ } else {
+ $variable = $increment;
+ }
+ return true;
+ }
+
+ public static function CastAsInt($floatnum) {
+ // convert to float if not already
+ $floatnum = (float) $floatnum;
+
+ // convert a float to type int, only if possible
+ if (self::trunc($floatnum) == $floatnum) {
+ // it's not floating point
+ if (self::intValueSupported($floatnum)) {
+ // it's within int range
+ $floatnum = (int) $floatnum;
+ }
+ }
+ return $floatnum;
+ }
+
+ public static function intValueSupported($num) {
+ // check if integers are 64-bit
+ static $hasINT64 = null;
+ if ($hasINT64 === null) { // 10x faster than is_null()
+ $hasINT64 = is_int(pow(2, 31)); // 32-bit int are limited to (2^31)-1
+ if (!$hasINT64 && !defined('PHP_INT_MIN')) {
+ define('PHP_INT_MIN', ~PHP_INT_MAX);
+ }
+ }
+ // if integers are 64-bit - no other check required
+ if ($hasINT64 || (($num <= PHP_INT_MAX) && ($num >= PHP_INT_MIN))) {
+ return true;
+ }
+ return false;
+ }
+
+ public static function DecimalizeFraction($fraction) {
+ list($numerator, $denominator) = explode('/', $fraction);
+ return $numerator / ($denominator ? $denominator : 1);
+ }
+
+
+ public static function DecimalBinary2Float($binarynumerator) {
+ $numerator = self::Bin2Dec($binarynumerator);
+ $denominator = self::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
+ return ($numerator / $denominator);
+ }
+
+
+ public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
+ // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ if (strpos($binarypointnumber, '.') === false) {
+ $binarypointnumber = '0.'.$binarypointnumber;
+ } elseif ($binarypointnumber{0} == '.') {
+ $binarypointnumber = '0'.$binarypointnumber;
+ }
+ $exponent = 0;
+ while (($binarypointnumber{0} != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
+ if (substr($binarypointnumber, 1, 1) == '.') {
+ $exponent--;
+ $binarypointnumber = substr($binarypointnumber, 2, 1).'.'.substr($binarypointnumber, 3);
+ } else {
+ $pointpos = strpos($binarypointnumber, '.');
+ $exponent += ($pointpos - 1);
+ $binarypointnumber = str_replace('.', '', $binarypointnumber);
+ $binarypointnumber = $binarypointnumber{0}.'.'.substr($binarypointnumber, 1);
+ }
+ }
+ $binarypointnumber = str_pad(substr($binarypointnumber, 0, $maxbits + 2), $maxbits + 2, '0', STR_PAD_RIGHT);
+ return array('normalized'=>$binarypointnumber, 'exponent'=>(int) $exponent);
+ }
+
+
+ public static function Float2BinaryDecimal($floatvalue) {
+ // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ $maxbits = 128; // to how many bits of precision should the calculations be taken?
+ $intpart = self::trunc($floatvalue);
+ $floatpart = abs($floatvalue - $intpart);
+ $pointbitstring = '';
+ while (($floatpart != 0) && (strlen($pointbitstring) < $maxbits)) {
+ $floatpart *= 2;
+ $pointbitstring .= (string) self::trunc($floatpart);
+ $floatpart -= self::trunc($floatpart);
+ }
+ $binarypointnumber = decbin($intpart).'.'.$pointbitstring;
+ return $binarypointnumber;
+ }
+
+
+ public static function Float2String($floatvalue, $bits) {
+ // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee-expl.html
+ switch ($bits) {
+ case 32:
+ $exponentbits = 8;
+ $fractionbits = 23;
+ break;
+
+ case 64:
+ $exponentbits = 11;
+ $fractionbits = 52;
+ break;
+
+ default:
+ return false;
+ break;
+ }
+ if ($floatvalue >= 0) {
+ $signbit = '0';
+ } else {
+ $signbit = '1';
+ }
+ $normalizedbinary = self::NormalizeBinaryPoint(self::Float2BinaryDecimal($floatvalue), $fractionbits);
+ $biasedexponent = pow(2, $exponentbits - 1) - 1 + $normalizedbinary['exponent']; // (127 or 1023) +/- exponent
+ $exponentbitstring = str_pad(decbin($biasedexponent), $exponentbits, '0', STR_PAD_LEFT);
+ $fractionbitstring = str_pad(substr($normalizedbinary['normalized'], 2), $fractionbits, '0', STR_PAD_RIGHT);
+
+ return self::BigEndian2String(self::Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
+ }
+
+
+ public static function LittleEndian2Float($byteword) {
+ return self::BigEndian2Float(strrev($byteword));
+ }
+
+
+ public static function BigEndian2Float($byteword) {
+ // ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
+ // http://www.psc.edu/general/software/packages/ieee/ieee.html
+ // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
+
+ $bitword = self::BigEndian2Bin($byteword);
+ if (!$bitword) {
+ return 0;
+ }
+ $signbit = $bitword{0};
+
+ switch (strlen($byteword) * 8) {
+ case 32:
+ $exponentbits = 8;
+ $fractionbits = 23;
+ break;
+
+ case 64:
+ $exponentbits = 11;
+ $fractionbits = 52;
+ break;
+
+ case 80:
+ // 80-bit Apple SANE format
+ // http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
+ $exponentstring = substr($bitword, 1, 15);
+ $isnormalized = intval($bitword{16});
+ $fractionstring = substr($bitword, 17, 63);
+ $exponent = pow(2, self::Bin2Dec($exponentstring) - 16383);
+ $fraction = $isnormalized + self::DecimalBinary2Float($fractionstring);
+ $floatvalue = $exponent * $fraction;
+ if ($signbit == '1') {
+ $floatvalue *= -1;
+ }
+ return $floatvalue;
+ break;
+
+ default:
+ return false;
+ break;
+ }
+ $exponentstring = substr($bitword, 1, $exponentbits);
+ $fractionstring = substr($bitword, $exponentbits + 1, $fractionbits);
+ $exponent = self::Bin2Dec($exponentstring);
+ $fraction = self::Bin2Dec($fractionstring);
+
+ if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) {
+ // Not a Number
+ $floatvalue = false;
+ } elseif (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction == 0)) {
+ if ($signbit == '1') {
+ $floatvalue = '-infinity';
+ } else {
+ $floatvalue = '+infinity';
+ }
+ } elseif (($exponent == 0) && ($fraction == 0)) {
+ if ($signbit == '1') {
+ $floatvalue = -0;
+ } else {
+ $floatvalue = 0;
+ }
+ $floatvalue = ($signbit ? 0 : -0);
+ } elseif (($exponent == 0) && ($fraction != 0)) {
+ // These are 'unnormalized' values
+ $floatvalue = pow(2, (-1 * (pow(2, $exponentbits - 1) - 2))) * self::DecimalBinary2Float($fractionstring);
+ if ($signbit == '1') {
+ $floatvalue *= -1;
+ }
+ } elseif ($exponent != 0) {
+ $floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + self::DecimalBinary2Float($fractionstring));
+ if ($signbit == '1') {
+ $floatvalue *= -1;
+ }
+ }
+ return (float) $floatvalue;
+ }
+
+
+ public static function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
+ $intvalue = 0;
+ $bytewordlen = strlen($byteword);
+ if ($bytewordlen == 0) {
+ return false;
+ }
+ for ($i = 0; $i < $bytewordlen; $i++) {
+ if ($synchsafe) { // disregard MSB, effectively 7-bit bytes
+ //$intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($bytewordlen - 1 - $i) * 7); // faster, but runs into problems past 2^31 on 32-bit systems
+ $intvalue += (ord($byteword{$i}) & 0x7F) * pow(2, ($bytewordlen - 1 - $i) * 7);
+ } else {
+ $intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
+ }
+ }
+ if ($signed && !$synchsafe) {
+ // synchsafe ints are not allowed to be signed
+ if ($bytewordlen <= PHP_INT_SIZE) {
+ $signMaskBit = 0x80 << (8 * ($bytewordlen - 1));
+ if ($intvalue & $signMaskBit) {
+ $intvalue = 0 - ($intvalue & ($signMaskBit - 1));
+ }
+ } else {
+ throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits ('.strlen($byteword).') in self::BigEndian2Int()');
+ break;
+ }
+ }
+ return self::CastAsInt($intvalue);
+ }
+
+
+ public static function LittleEndian2Int($byteword, $signed=false) {
+ return self::BigEndian2Int(strrev($byteword), false, $signed);
+ }
+
+
+ public static function BigEndian2Bin($byteword) {
+ $binvalue = '';
+ $bytewordlen = strlen($byteword);
+ for ($i = 0; $i < $bytewordlen; $i++) {
+ $binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
+ }
+ return $binvalue;
+ }
+
+
+ public static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
+ if ($number < 0) {
+ throw new Exception('ERROR: self::BigEndian2String() does not support negative numbers');
+ }
+ $maskbyte = (($synchsafe || $signed) ? 0x7F : 0xFF);
+ $intstring = '';
+ if ($signed) {
+ if ($minbytes > PHP_INT_SIZE) {
+ throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits in self::BigEndian2String()');
+ }
+ $number = $number & (0x80 << (8 * ($minbytes - 1)));
+ }
+ while ($number != 0) {
+ $quotient = ($number / ($maskbyte + 1));
+ $intstring = chr(ceil(($quotient - floor($quotient)) * $maskbyte)).$intstring;
+ $number = floor($quotient);
+ }
+ return str_pad($intstring, $minbytes, "\x00", STR_PAD_LEFT);
+ }
+
+
+ public static function Dec2Bin($number) {
+ while ($number >= 256) {
+ $bytes[] = (($number / 256) - (floor($number / 256))) * 256;
+ $number = floor($number / 256);
+ }
+ $bytes[] = $number;
+ $binstring = '';
+ for ($i = 0; $i < count($bytes); $i++) {
+ $binstring = (($i == count($bytes) - 1) ? decbin($bytes[$i]) : str_pad(decbin($bytes[$i]), 8, '0', STR_PAD_LEFT)).$binstring;
+ }
+ return $binstring;
+ }
+
+
+ public static function Bin2Dec($binstring, $signed=false) {
+ $signmult = 1;
+ if ($signed) {
+ if ($binstring{0} == '1') {
+ $signmult = -1;
+ }
+ $binstring = substr($binstring, 1);
+ }
+ $decvalue = 0;
+ for ($i = 0; $i < strlen($binstring); $i++) {
+ $decvalue += ((int) substr($binstring, strlen($binstring) - $i - 1, 1)) * pow(2, $i);
+ }
+ return self::CastAsInt($decvalue * $signmult);
+ }
+
+
+ public static function Bin2String($binstring) {
+ // return 'hi' for input of '0110100001101001'
+ $string = '';
+ $binstringreversed = strrev($binstring);
+ for ($i = 0; $i < strlen($binstringreversed); $i += 8) {
+ $string = chr(self::Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
+ }
+ return $string;
+ }
+
+
+ public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+ $intstring = '';
+ while ($number > 0) {
+ if ($synchsafe) {
+ $intstring = $intstring.chr($number & 127);
+ $number >>= 7;
+ } else {
+ $intstring = $intstring.chr($number & 255);
+ $number >>= 8;
+ }
+ }
+ return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
+ }
+
+
+ public static function array_merge_clobber($array1, $array2) {
+ // written by kc�hireability*com
+ // taken from http://www.php.net/manual/en/function.array-merge-recursive.php
+ if (!is_array($array1) || !is_array($array2)) {
+ return false;
+ }
+ $newarray = $array1;
+ foreach ($array2 as $key => $val) {
+ if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
+ $newarray[$key] = self::array_merge_clobber($newarray[$key], $val);
+ } else {
+ $newarray[$key] = $val;
+ }
+ }
+ return $newarray;
+ }
+
+
+ public static function array_merge_noclobber($array1, $array2) {
+ if (!is_array($array1) || !is_array($array2)) {
+ return false;
+ }
+ $newarray = $array1;
+ foreach ($array2 as $key => $val) {
+ if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
+ $newarray[$key] = self::array_merge_noclobber($newarray[$key], $val);
+ } elseif (!isset($newarray[$key])) {
+ $newarray[$key] = $val;
+ }
+ }
+ return $newarray;
+ }
+
+
+ public static function ksort_recursive(&$theArray) {
+ ksort($theArray);
+ foreach ($theArray as $key => $value) {
+ if (is_array($value)) {
+ self::ksort_recursive($theArray[$key]);
+ }
+ }
+ return true;
+ }
+
+ public static function fileextension($filename, $numextensions=1) {
+ if (strstr($filename, '.')) {
+ $reversedfilename = strrev($filename);
+ $offset = 0;
+ for ($i = 0; $i < $numextensions; $i++) {
+ $offset = strpos($reversedfilename, '.', $offset + 1);
+ if ($offset === false) {
+ return '';
+ }
+ }
+ return strrev(substr($reversedfilename, 0, $offset));
+ }
+ return '';
+ }
+
+
+ public static function PlaytimeString($seconds) {
+ $sign = (($seconds < 0) ? '-' : '');
+ $seconds = round(abs($seconds));
+ $H = (int) floor( $seconds / 3600);
+ $M = (int) floor(($seconds - (3600 * $H) ) / 60);
+ $S = (int) round( $seconds - (3600 * $H) - (60 * $M) );
+ return $sign.($H ? $H.':' : '').($H ? str_pad($M, 2, '0', STR_PAD_LEFT) : intval($M)).':'.str_pad($S, 2, 0, STR_PAD_LEFT);
+ }
+
+
+ public static function DateMac2Unix($macdate) {
+ // Macintosh timestamp: seconds since 00:00h January 1, 1904
+ // UNIX timestamp: seconds since 00:00h January 1, 1970
+ return self::CastAsInt($macdate - 2082844800);
+ }
+
+
+ public static function FixedPoint8_8($rawdata) {
+ return self::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (self::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
+ }
+
+
+ public static function FixedPoint16_16($rawdata) {
+ return self::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (self::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
+ }
+
+
+ public static function FixedPoint2_30($rawdata) {
+ $binarystring = self::BigEndian2Bin($rawdata);
+ return self::Bin2Dec(substr($binarystring, 0, 2)) + (float) (self::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
+ }
+
+
+ public static function CreateDeepArray($ArrayPath, $Separator, $Value) {
+ // assigns $Value to a nested array path:
+ // $foo = self::CreateDeepArray('/path/to/my', '/', 'file.txt')
+ // is the same as:
+ // $foo = array('path'=>array('to'=>'array('my'=>array('file.txt'))));
+ // or
+ // $foo['path']['to']['my'] = 'file.txt';
+ $ArrayPath = ltrim($ArrayPath, $Separator);
+ if (($pos = strpos($ArrayPath, $Separator)) !== false) {
+ $ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
+ } else {
+ $ReturnedArray[$ArrayPath] = $Value;
+ }
+ return $ReturnedArray;
+ }
+
+ public static function array_max($arraydata, $returnkey=false) {
+ $maxvalue = false;
+ $maxkey = false;
+ foreach ($arraydata as $key => $value) {
+ if (!is_array($value)) {
+ if ($value > $maxvalue) {
+ $maxvalue = $value;
+ $maxkey = $key;
+ }
+ }
+ }
+ return ($returnkey ? $maxkey : $maxvalue);
+ }
+
+ public static function array_min($arraydata, $returnkey=false) {
+ $minvalue = false;
+ $minkey = false;
+ foreach ($arraydata as $key => $value) {
+ if (!is_array($value)) {
+ if ($value > $minvalue) {
+ $minvalue = $value;
+ $minkey = $key;
+ }
+ }
+ }
+ return ($returnkey ? $minkey : $minvalue);
+ }
+
+ public static function XML2array($XMLstring) {
+ if (function_exists('simplexml_load_string')) {
+ if (function_exists('get_object_vars')) {
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $XMLobject = simplexml_load_string($XMLstring);
++ libxml_disable_entity_loader($loadEntities);
+ return self::SimpleXMLelement2array($XMLobject);
+ }
+ }
+ return false;
+ }
+
+ public static function SimpleXMLelement2array($XMLobject) {
+ if (!is_object($XMLobject) && !is_array($XMLobject)) {
+ return $XMLobject;
+ }
+ $XMLarray = (is_object($XMLobject) ? get_object_vars($XMLobject) : $XMLobject);
+ foreach ($XMLarray as $key => $value) {
+ $XMLarray[$key] = self::SimpleXMLelement2array($value);
+ }
+ return $XMLarray;
+ }
+
+
+ // Allan Hansen <ah�artemis*dk>
+ // self::md5_data() - returns md5sum for a file from startuing position to absolute end position
+ public static function hash_data($file, $offset, $end, $algorithm) {
+ static $tempdir = '';
+ if (!self::intValueSupported($end)) {
+ return false;
+ }
+ switch ($algorithm) {
+ case 'md5':
+ $hash_function = 'md5_file';
+ $unix_call = 'md5sum';
+ $windows_call = 'md5sum.exe';
+ $hash_length = 32;
+ break;
+
+ case 'sha1':
+ $hash_function = 'sha1_file';
+ $unix_call = 'sha1sum';
+ $windows_call = 'sha1sum.exe';
+ $hash_length = 40;
+ break;
+
+ default:
+ throw new Exception('Invalid algorithm ('.$algorithm.') in self::hash_data()');
+ break;
+ }
+ $size = $end - $offset;
+ while (true) {
+ if (GETID3_OS_ISWINDOWS) {
+
+ // It seems that sha1sum.exe for Windows only works on physical files, does not accept piped data
+ // Fall back to create-temp-file method:
+ if ($algorithm == 'sha1') {
+ break;
+ }
+
+ $RequiredFiles = array('cygwin1.dll', 'head.exe', 'tail.exe', $windows_call);
+ foreach ($RequiredFiles as $required_file) {
+ if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
+ // helper apps not available - fall back to old method
+ break 2;
+ }
+ }
+ $commandline = GETID3_HELPERAPPSDIR.'head.exe -c '.$end.' '.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $file)).' | ';
+ $commandline .= GETID3_HELPERAPPSDIR.'tail.exe -c '.$size.' | ';
+ $commandline .= GETID3_HELPERAPPSDIR.$windows_call;
+
+ } else {
+
+ $commandline = 'head -c'.$end.' '.escapeshellarg($file).' | ';
+ $commandline .= 'tail -c'.$size.' | ';
+ $commandline .= $unix_call;
+
+ }
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ //throw new Exception('PHP running in Safe Mode - backtick operator not available, using slower non-system-call '.$algorithm.' algorithm');
+ break;
+ }
+ return substr(`$commandline`, 0, $hash_length);
+ }
+
+ if (empty($tempdir)) {
+ // yes this is ugly, feel free to suggest a better way
+ require_once(dirname(__FILE__).'/getid3.php');
+ $getid3_temp = new getID3();
+ $tempdir = $getid3_temp->tempdir;
+ unset($getid3_temp);
+ }
+ // try to create a temporary file in the system temp directory - invalid dirname should force to system temp dir
+ if (($data_filename = tempnam($tempdir, 'gI3')) === false) {
+ // can't find anywhere to create a temp file, just fail
+ return false;
+ }
+
+ // Init
+ $result = false;
+
+ // copy parts of file
+ try {
+ self::CopyFileParts($file, $data_filename, $offset, $end - $offset);
+ $result = $hash_function($data_filename);
+ } catch (Exception $e) {
+ throw new Exception('self::CopyFileParts() failed in getid_lib::hash_data(): '.$e->getMessage());
+ }
+ unlink($data_filename);
+ return $result;
+ }
+
+ public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
+ if (!self::intValueSupported($offset + $length)) {
+ throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
+ }
+ if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
+ if (($fp_dest = fopen($filename_dest, 'wb'))) {
+ if (fseek($fp_src, $offset, SEEK_SET) == 0) {
+ $byteslefttowrite = $length;
+ while (($byteslefttowrite > 0) && ($buffer = fread($fp_src, min($byteslefttowrite, getID3::FREAD_BUFFER_SIZE)))) {
+ $byteswritten = fwrite($fp_dest, $buffer, $byteslefttowrite);
+ $byteslefttowrite -= $byteswritten;
+ }
+ return true;
+ } else {
+ throw new Exception('failed to seek to offset '.$offset.' in '.$filename_source);
+ }
+ fclose($fp_dest);
+ } else {
+ throw new Exception('failed to create file for writing '.$filename_dest);
+ }
+ fclose($fp_src);
+ } else {
+ throw new Exception('failed to open file for reading '.$filename_source);
+ }
+ return false;
+ }
+
+ public static function iconv_fallback_int_utf8($charval) {
+ if ($charval < 128) {
+ // 0bbbbbbb
+ $newcharstring = chr($charval);
+ } elseif ($charval < 2048) {
+ // 110bbbbb 10bbbbbb
+ $newcharstring = chr(($charval >> 6) | 0xC0);
+ $newcharstring .= chr(($charval & 0x3F) | 0x80);
+ } elseif ($charval < 65536) {
+ // 1110bbbb 10bbbbbb 10bbbbbb
+ $newcharstring = chr(($charval >> 12) | 0xE0);
+ $newcharstring .= chr(($charval >> 6) | 0xC0);
+ $newcharstring .= chr(($charval & 0x3F) | 0x80);
+ } else {
+ // 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+ $newcharstring = chr(($charval >> 18) | 0xF0);
+ $newcharstring .= chr(($charval >> 12) | 0xC0);
+ $newcharstring .= chr(($charval >> 6) | 0xC0);
+ $newcharstring .= chr(($charval & 0x3F) | 0x80);
+ }
+ return $newcharstring;
+ }
+
+ // ISO-8859-1 => UTF-8
+ public static function iconv_fallback_iso88591_utf8($string, $bom=false) {
+ if (function_exists('utf8_encode')) {
+ return utf8_encode($string);
+ }
+ // utf8_encode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
+ $newcharstring = '';
+ if ($bom) {
+ $newcharstring .= "\xEF\xBB\xBF";
+ }
+ for ($i = 0; $i < strlen($string); $i++) {
+ $charval = ord($string{$i});
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
+ }
+ return $newcharstring;
+ }
+
+ // ISO-8859-1 => UTF-16BE
+ public static function iconv_fallback_iso88591_utf16be($string, $bom=false) {
+ $newcharstring = '';
+ if ($bom) {
+ $newcharstring .= "\xFE\xFF";
+ }
+ for ($i = 0; $i < strlen($string); $i++) {
+ $newcharstring .= "\x00".$string{$i};
+ }
+ return $newcharstring;
+ }
+
+ // ISO-8859-1 => UTF-16LE
+ public static function iconv_fallback_iso88591_utf16le($string, $bom=false) {
+ $newcharstring = '';
+ if ($bom) {
+ $newcharstring .= "\xFF\xFE";
+ }
+ for ($i = 0; $i < strlen($string); $i++) {
+ $newcharstring .= $string{$i}."\x00";
+ }
+ return $newcharstring;
+ }
+
+ // ISO-8859-1 => UTF-16LE (BOM)
+ public static function iconv_fallback_iso88591_utf16($string) {
+ return self::iconv_fallback_iso88591_utf16le($string, true);
+ }
+
+ // UTF-8 => ISO-8859-1
+ public static function iconv_fallback_utf8_iso88591($string) {
+ if (function_exists('utf8_decode')) {
+ return utf8_decode($string);
+ }
+ // utf8_decode() unavailable, use getID3()'s iconv_fallback() conversions (possibly PHP is compiled without XML support)
+ $newcharstring = '';
+ $offset = 0;
+ $stringlength = strlen($string);
+ while ($offset < $stringlength) {
+ if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ // 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 12) &
+ ((ord($string{($offset + 2)}) & 0x3F) << 6) &
+ (ord($string{($offset + 3)}) & 0x3F);
+ $offset += 4;
+ } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ // 1110bbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 6) &
+ (ord($string{($offset + 2)}) & 0x3F);
+ $offset += 3;
+ } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ // 110bbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
+ (ord($string{($offset + 1)}) & 0x3F);
+ $offset += 2;
+ } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ // 0bbbbbbb
+ $charval = ord($string{$offset});
+ $offset += 1;
+ } else {
+ // error? throw some kind of warning here?
+ $charval = false;
+ $offset += 1;
+ }
+ if ($charval !== false) {
+ $newcharstring .= (($charval < 256) ? chr($charval) : '?');
+ }
+ }
+ return $newcharstring;
+ }
+
+ // UTF-8 => UTF-16BE
+ public static function iconv_fallback_utf8_utf16be($string, $bom=false) {
+ $newcharstring = '';
+ if ($bom) {
+ $newcharstring .= "\xFE\xFF";
+ }
+ $offset = 0;
+ $stringlength = strlen($string);
+ while ($offset < $stringlength) {
+ if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ // 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 12) &
+ ((ord($string{($offset + 2)}) & 0x3F) << 6) &
+ (ord($string{($offset + 3)}) & 0x3F);
+ $offset += 4;
+ } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ // 1110bbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 6) &
+ (ord($string{($offset + 2)}) & 0x3F);
+ $offset += 3;
+ } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ // 110bbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
+ (ord($string{($offset + 1)}) & 0x3F);
+ $offset += 2;
+ } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ // 0bbbbbbb
+ $charval = ord($string{$offset});
+ $offset += 1;
+ } else {
+ // error? throw some kind of warning here?
+ $charval = false;
+ $offset += 1;
+ }
+ if ($charval !== false) {
+ $newcharstring .= (($charval < 65536) ? self::BigEndian2String($charval, 2) : "\x00".'?');
+ }
+ }
+ return $newcharstring;
+ }
+
+ // UTF-8 => UTF-16LE
+ public static function iconv_fallback_utf8_utf16le($string, $bom=false) {
+ $newcharstring = '';
+ if ($bom) {
+ $newcharstring .= "\xFF\xFE";
+ }
+ $offset = 0;
+ $stringlength = strlen($string);
+ while ($offset < $stringlength) {
+ if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ // 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 12) &
+ ((ord($string{($offset + 2)}) & 0x3F) << 6) &
+ (ord($string{($offset + 3)}) & 0x3F);
+ $offset += 4;
+ } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ // 1110bbbb 10bbbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
+ ((ord($string{($offset + 1)}) & 0x3F) << 6) &
+ (ord($string{($offset + 2)}) & 0x3F);
+ $offset += 3;
+ } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ // 110bbbbb 10bbbbbb
+ $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
+ (ord($string{($offset + 1)}) & 0x3F);
+ $offset += 2;
+ } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ // 0bbbbbbb
+ $charval = ord($string{$offset});
+ $offset += 1;
+ } else {
+ // error? maybe throw some warning here?
+ $charval = false;
+ $offset += 1;
+ }
+ if ($charval !== false) {
+ $newcharstring .= (($charval < 65536) ? self::LittleEndian2String($charval, 2) : '?'."\x00");
+ }
+ }
+ return $newcharstring;
+ }
+
+ // UTF-8 => UTF-16LE (BOM)
+ public static function iconv_fallback_utf8_utf16($string) {
+ return self::iconv_fallback_utf8_utf16le($string, true);
+ }
+
+ // UTF-16BE => UTF-8
+ public static function iconv_fallback_utf16be_utf8($string) {
+ if (substr($string, 0, 2) == "\xFE\xFF") {
+ // strip BOM
+ $string = substr($string, 2);
+ }
+ $newcharstring = '';
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
+ }
+ return $newcharstring;
+ }
+
+ // UTF-16LE => UTF-8
+ public static function iconv_fallback_utf16le_utf8($string) {
+ if (substr($string, 0, 2) == "\xFF\xFE") {
+ // strip BOM
+ $string = substr($string, 2);
+ }
+ $newcharstring = '';
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
+ }
+ return $newcharstring;
+ }
+
+ // UTF-16BE => ISO-8859-1
+ public static function iconv_fallback_utf16be_iso88591($string) {
+ if (substr($string, 0, 2) == "\xFE\xFF") {
+ // strip BOM
+ $string = substr($string, 2);
+ }
+ $newcharstring = '';
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
+ $newcharstring .= (($charval < 256) ? chr($charval) : '?');
+ }
+ return $newcharstring;
+ }
+
+ // UTF-16LE => ISO-8859-1
+ public static function iconv_fallback_utf16le_iso88591($string) {
+ if (substr($string, 0, 2) == "\xFF\xFE") {
+ // strip BOM
+ $string = substr($string, 2);
+ }
+ $newcharstring = '';
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
+ $newcharstring .= (($charval < 256) ? chr($charval) : '?');
+ }
+ return $newcharstring;
+ }
+
+ // UTF-16 (BOM) => ISO-8859-1
+ public static function iconv_fallback_utf16_iso88591($string) {
+ $bom = substr($string, 0, 2);
+ if ($bom == "\xFE\xFF") {
+ return self::iconv_fallback_utf16be_iso88591(substr($string, 2));
+ } elseif ($bom == "\xFF\xFE") {
+ return self::iconv_fallback_utf16le_iso88591(substr($string, 2));
+ }
+ return $string;
+ }
+
+ // UTF-16 (BOM) => UTF-8
+ public static function iconv_fallback_utf16_utf8($string) {
+ $bom = substr($string, 0, 2);
+ if ($bom == "\xFE\xFF") {
+ return self::iconv_fallback_utf16be_utf8(substr($string, 2));
+ } elseif ($bom == "\xFF\xFE") {
+ return self::iconv_fallback_utf16le_utf8(substr($string, 2));
+ }
+ return $string;
+ }
+
+ public static function iconv_fallback($in_charset, $out_charset, $string) {
+
+ if ($in_charset == $out_charset) {
+ return $string;
+ }
+
+ // iconv() availble
+ if (function_exists('iconv')) {
+ if ($converted_string = @iconv($in_charset, $out_charset.'//TRANSLIT', $string)) {
+ switch ($out_charset) {
+ case 'ISO-8859-1':
+ $converted_string = rtrim($converted_string, "\x00");
+ break;
+ }
+ return $converted_string;
+ }
+
+ // iconv() may sometimes fail with "illegal character in input string" error message
+ // and return an empty string, but returning the unconverted string is more useful
+ return $string;
+ }
+
+
+ // iconv() not available
+ static $ConversionFunctionList = array();
+ if (empty($ConversionFunctionList)) {
+ $ConversionFunctionList['ISO-8859-1']['UTF-8'] = 'iconv_fallback_iso88591_utf8';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16'] = 'iconv_fallback_iso88591_utf16';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16BE'] = 'iconv_fallback_iso88591_utf16be';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16LE'] = 'iconv_fallback_iso88591_utf16le';
+ $ConversionFunctionList['UTF-8']['ISO-8859-1'] = 'iconv_fallback_utf8_iso88591';
+ $ConversionFunctionList['UTF-8']['UTF-16'] = 'iconv_fallback_utf8_utf16';
+ $ConversionFunctionList['UTF-8']['UTF-16BE'] = 'iconv_fallback_utf8_utf16be';
+ $ConversionFunctionList['UTF-8']['UTF-16LE'] = 'iconv_fallback_utf8_utf16le';
+ $ConversionFunctionList['UTF-16']['ISO-8859-1'] = 'iconv_fallback_utf16_iso88591';
+ $ConversionFunctionList['UTF-16']['UTF-8'] = 'iconv_fallback_utf16_utf8';
+ $ConversionFunctionList['UTF-16LE']['ISO-8859-1'] = 'iconv_fallback_utf16le_iso88591';
+ $ConversionFunctionList['UTF-16LE']['UTF-8'] = 'iconv_fallback_utf16le_utf8';
+ $ConversionFunctionList['UTF-16BE']['ISO-8859-1'] = 'iconv_fallback_utf16be_iso88591';
+ $ConversionFunctionList['UTF-16BE']['UTF-8'] = 'iconv_fallback_utf16be_utf8';
+ }
+ if (isset($ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)])) {
+ $ConversionFunction = $ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)];
+ return self::$ConversionFunction($string);
+ }
+ throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
+ }
+
+
+ public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
+ $string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string
+ $HTMLstring = '';
+
+ switch ($charset) {
+ case '1251':
+ case '1252':
+ case '866':
+ case '932':
+ case '936':
+ case '950':
+ case 'BIG5':
+ case 'BIG5-HKSCS':
+ case 'cp1251':
+ case 'cp1252':
+ case 'cp866':
+ case 'EUC-JP':
+ case 'EUCJP':
+ case 'GB2312':
+ case 'ibm866':
+ case 'ISO-8859-1':
+ case 'ISO-8859-15':
+ case 'ISO8859-1':
+ case 'ISO8859-15':
+ case 'KOI8-R':
+ case 'koi8-ru':
+ case 'koi8r':
+ case 'Shift_JIS':
+ case 'SJIS':
+ case 'win-1251':
+ case 'Windows-1251':
+ case 'Windows-1252':
+ $HTMLstring = htmlentities($string, ENT_COMPAT, $charset);
+ break;
+
+ case 'UTF-8':
+ $strlen = strlen($string);
+ for ($i = 0; $i < $strlen; $i++) {
+ $char_ord_val = ord($string{$i});
+ $charval = 0;
+ if ($char_ord_val < 0x80) {
+ $charval = $char_ord_val;
+ } elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F && $i+3 < $strlen) {
+ $charval = (($char_ord_val & 0x07) << 18);
+ $charval += ((ord($string{++$i}) & 0x3F) << 12);
+ $charval += ((ord($string{++$i}) & 0x3F) << 6);
+ $charval += (ord($string{++$i}) & 0x3F);
+ } elseif ((($char_ord_val & 0xE0) >> 5) == 0x07 && $i+2 < $strlen) {
+ $charval = (($char_ord_val & 0x0F) << 12);
+ $charval += ((ord($string{++$i}) & 0x3F) << 6);
+ $charval += (ord($string{++$i}) & 0x3F);
+ } elseif ((($char_ord_val & 0xC0) >> 6) == 0x03 && $i+1 < $strlen) {
+ $charval = (($char_ord_val & 0x1F) << 6);
+ $charval += (ord($string{++$i}) & 0x3F);
+ }
+ if (($charval >= 32) && ($charval <= 127)) {
+ $HTMLstring .= htmlentities(chr($charval));
+ } else {
+ $HTMLstring .= '&#'.$charval.';';
+ }
+ }
+ break;
+
+ case 'UTF-16LE':
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
+ if (($charval >= 32) && ($charval <= 127)) {
+ $HTMLstring .= chr($charval);
+ } else {
+ $HTMLstring .= '&#'.$charval.';';
+ }
+ }
+ break;
+
+ case 'UTF-16BE':
+ for ($i = 0; $i < strlen($string); $i += 2) {
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
+ if (($charval >= 32) && ($charval <= 127)) {
+ $HTMLstring .= chr($charval);
+ } else {
+ $HTMLstring .= '&#'.$charval.';';
+ }
+ }
+ break;
+
+ default:
+ $HTMLstring = 'ERROR: Character set "'.$charset.'" not supported in MultiByteCharString2HTML()';
+ break;
+ }
+ return $HTMLstring;
+ }
+
+
+
+ public static function RGADnameLookup($namecode) {
+ static $RGADname = array();
+ if (empty($RGADname)) {
+ $RGADname[0] = 'not set';
+ $RGADname[1] = 'Track Gain Adjustment';
+ $RGADname[2] = 'Album Gain Adjustment';
+ }
+
+ return (isset($RGADname[$namecode]) ? $RGADname[$namecode] : '');
+ }
+
+
+ public static function RGADoriginatorLookup($originatorcode) {
+ static $RGADoriginator = array();
+ if (empty($RGADoriginator)) {
+ $RGADoriginator[0] = 'unspecified';
+ $RGADoriginator[1] = 'pre-set by artist/producer/mastering engineer';
+ $RGADoriginator[2] = 'set by user';
+ $RGADoriginator[3] = 'determined automatically';
+ }
+
+ return (isset($RGADoriginator[$originatorcode]) ? $RGADoriginator[$originatorcode] : '');
+ }
+
+
+ public static function RGADadjustmentLookup($rawadjustment, $signbit) {
+ $adjustment = $rawadjustment / 10;
+ if ($signbit == 1) {
+ $adjustment *= -1;
+ }
+ return (float) $adjustment;
+ }
+
+
+ public static function RGADgainString($namecode, $originatorcode, $replaygain) {
+ if ($replaygain < 0) {
+ $signbit = '1';
+ } else {
+ $signbit = '0';
+ }
+ $storedreplaygain = intval(round($replaygain * 10));
+ $gainstring = str_pad(decbin($namecode), 3, '0', STR_PAD_LEFT);
+ $gainstring .= str_pad(decbin($originatorcode), 3, '0', STR_PAD_LEFT);
+ $gainstring .= $signbit;
+ $gainstring .= str_pad(decbin($storedreplaygain), 9, '0', STR_PAD_LEFT);
+
+ return $gainstring;
+ }
+
+ public static function RGADamplitude2dB($amplitude) {
+ return 20 * log10($amplitude);
+ }
+
+
+ public static function GetDataImageSize($imgData, &$imageinfo=array()) {
+ static $tempdir = '';
+ if (empty($tempdir)) {
+ // yes this is ugly, feel free to suggest a better way
+ require_once(dirname(__FILE__).'/getid3.php');
+ $getid3_temp = new getID3();
+ $tempdir = $getid3_temp->tempdir;
+ unset($getid3_temp);
+ }
+ $GetDataImageSize = false;
+ if ($tempfilename = tempnam($tempdir, 'gI3')) {
+ if (is_writable($tempfilename) && is_file($tempfilename) && ($tmp = fopen($tempfilename, 'wb'))) {
+ fwrite($tmp, $imgData);
+ fclose($tmp);
+ $GetDataImageSize = @getimagesize($tempfilename, $imageinfo);
+ }
+ unlink($tempfilename);
+ }
+ return $GetDataImageSize;
+ }
+
+ public static function ImageExtFromMime($mime_type) {
+ // temporary way, works OK for now, but should be reworked in the future
+ return str_replace(array('image/', 'x-', 'jpeg'), array('', '', 'jpg'), $mime_type);
+ }
+
+ public static function ImageTypesLookup($imagetypeid) {
+ static $ImageTypesLookup = array();
+ if (empty($ImageTypesLookup)) {
+ $ImageTypesLookup[1] = 'gif';
+ $ImageTypesLookup[2] = 'jpeg';
+ $ImageTypesLookup[3] = 'png';
+ $ImageTypesLookup[4] = 'swf';
+ $ImageTypesLookup[5] = 'psd';
+ $ImageTypesLookup[6] = 'bmp';
+ $ImageTypesLookup[7] = 'tiff (little-endian)';
+ $ImageTypesLookup[8] = 'tiff (big-endian)';
+ $ImageTypesLookup[9] = 'jpc';
+ $ImageTypesLookup[10] = 'jp2';
+ $ImageTypesLookup[11] = 'jpx';
+ $ImageTypesLookup[12] = 'jb2';
+ $ImageTypesLookup[13] = 'swc';
+ $ImageTypesLookup[14] = 'iff';
+ }
+ return (isset($ImageTypesLookup[$imagetypeid]) ? $ImageTypesLookup[$imagetypeid] : '');
+ }
+
+ public static function CopyTagsToComments(&$ThisFileInfo) {
+
+ // Copy all entries from ['tags'] into common ['comments']
+ if (!empty($ThisFileInfo['tags'])) {
+ foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
+ foreach ($tagarray as $tagname => $tagdata) {
+ foreach ($tagdata as $key => $value) {
+ if (!empty($value)) {
+ if (empty($ThisFileInfo['comments'][$tagname])) {
+
+ // fall through and append value
+
+ } elseif ($tagtype == 'id3v1') {
+
+ $newvaluelength = strlen(trim($value));
+ foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
+ $oldvaluelength = strlen(trim($existingvalue));
+ if (($newvaluelength <= $oldvaluelength) && (substr($existingvalue, 0, $newvaluelength) == trim($value))) {
+ // new value is identical but shorter-than (or equal-length to) one already in comments - skip
+ break 2;
+ }
+ }
+
+ } elseif (!is_array($value)) {
+
+ $newvaluelength = strlen(trim($value));
+ foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
+ $oldvaluelength = strlen(trim($existingvalue));
+ if (($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
+ $ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
+ break 2;
+ }
+ }
+
+ }
+ if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
+ $value = (is_string($value) ? trim($value) : $value);
+ $ThisFileInfo['comments'][$tagname][] = $value;
+ }
+ }
+ }
+ }
+ }
+
+ // Copy to ['comments_html']
+ foreach ($ThisFileInfo['comments'] as $field => $values) {
+ if ($field == 'picture') {
+ // pictures can take up a lot of space, and we don't need multiple copies of them
+ // let there be a single copy in [comments][picture], and not elsewhere
+ continue;
+ }
+ foreach ($values as $index => $value) {
+ if (is_array($value)) {
+ $ThisFileInfo['comments_html'][$field][$index] = $value;
+ } else {
+ $ThisFileInfo['comments_html'][$field][$index] = str_replace('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+
+ public static function EmbeddedLookup($key, $begin, $end, $file, $name) {
+
+ // Cached
+ static $cache;
+ if (isset($cache[$file][$name])) {
+ return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
+ }
+
+ // Init
+ $keylength = strlen($key);
+ $line_count = $end - $begin - 7;
+
+ // Open php file
+ $fp = fopen($file, 'r');
+
+ // Discard $begin lines
+ for ($i = 0; $i < ($begin + 3); $i++) {
+ fgets($fp, 1024);
+ }
+
+ // Loop thru line
+ while (0 < $line_count--) {
+
+ // Read line
+ $line = ltrim(fgets($fp, 1024), "\t ");
+
+ // METHOD A: only cache the matching key - less memory but slower on next lookup of not-previously-looked-up key
+ //$keycheck = substr($line, 0, $keylength);
+ //if ($key == $keycheck) {
+ // $cache[$file][$name][$keycheck] = substr($line, $keylength + 1);
+ // break;
+ //}
+
+ // METHOD B: cache all keys in this lookup - more memory but faster on next lookup of not-previously-looked-up key
+ //$cache[$file][$name][substr($line, 0, $keylength)] = trim(substr($line, $keylength + 1));
+ $explodedLine = explode("\t", $line, 2);
+ $ThisKey = (isset($explodedLine[0]) ? $explodedLine[0] : '');
+ $ThisValue = (isset($explodedLine[1]) ? $explodedLine[1] : '');
+ $cache[$file][$name][$ThisKey] = trim($ThisValue);
+ }
+
+ // Close and return
+ fclose($fp);
+ return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
+ }
+
+ public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
+ global $GETID3_ERRORARRAY;
+
+ if (file_exists($filename)) {
+ if (include_once($filename)) {
+ return true;
+ } else {
+ $diemessage = basename($sourcefile).' depends on '.$filename.', which has errors';
+ }
+ } else {
+ $diemessage = basename($sourcefile).' depends on '.$filename.', which is missing';
+ }
+ if ($DieOnFailure) {
+ throw new Exception($diemessage);
+ } else {
+ $GETID3_ERRORARRAY[] = $diemessage;
+ }
+ return false;
+ }
+
+ public static function trimNullByte($string) {
+ return trim($string, "\x00");
+ }
+
+ public static function getFileSizeSyscall($path) {
+ $filesize = false;
+
+ if (GETID3_OS_ISWINDOWS) {
+ if (class_exists('COM')) { // From PHP 5.3.15 and 5.4.5, COM and DOTNET is no longer built into the php core.you have to add COM support in php.ini:
+ $filesystem = new COM('Scripting.FileSystemObject');
+ $file = $filesystem->GetFile($path);
+ $filesize = $file->Size();
+ unset($filesystem, $file);
+ } else {
+ $commandline = 'for %I in ('.escapeshellarg($path).') do @echo %~zI';
+ }
+ } else {
+ $commandline = 'ls -l '.escapeshellarg($path).' | awk \'{print $5}\'';
+ }
+ if (isset($commandline)) {
+ $output = trim(`$commandline`);
+ if (ctype_digit($output)) {
+ $filesize = (float) $output;
+ }
+ }
+ return $filesize;
+ }
+
+}
diff --cc 3rdparty/phpdocx/classes/CreateDocx.inc
index 8befdf1,0000000..2780cbc
mode 100644,000000..100644
--- a/3rdparty/phpdocx/classes/CreateDocx.inc
+++ b/3rdparty/phpdocx/classes/CreateDocx.inc
@@@ -1,3730 -1,0 +1,3741 @@@
+<?php
+
+/**
+ * Generate a DOCX file
+ *
+ * @category Phpdocx
+ * @package create
+ * @copyright Copyright (c) Narcea Producciones Multimedia S.L.
+ * (http://www.2mdc.com)
+ * @license LGPL
+ * @version 3.0
+ * @link http://www.phpdocx.com
+ * @since File available since Release 3.0
+ */
+
+error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
+require_once dirname(__FILE__) . '/AutoLoader.inc';
+AutoLoader::load();
+require_once dirname(__FILE__) . '/Phpdocx_config.inc';
+
+class CreateDocx extends CreateDocument
+{
+ const NAMESPACEWORD = 'w';
+ const SCHEMA_IMAGEDOCUMENT =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image';
+ const SCHEMA_OFFICEDOCUMENT =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
+
+ /**
+ *
+ * @var string
+ * @access public
+ * @static
+ */
+ public static $PHPDOCXStyles;
+ /**
+ *
+ * @access public
+ * @static
+ * @var integer
+ */
+ public static $numUL;
+ /**
+ *
+ * @access public
+ * @var integer
+ */
+ public static $numOL;
+ /**
+ *
+ * @var string
+ * @access public
+ * @static
+ */
+ public static $orderedListStyle;
+ /**
+ *
+ * @var string
+ * @access public
+ * @static
+ */
+ public static $unorderedListStyle;
+ /**
+ *
+ * @access public
+ * @var array
+ */
+ public $fileGraphicTemplate;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $footerAdded;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $headerAdded;
+ /**
+ *
+ * @access public
+ * @var string
+ */
+ public $graphicTemplate;
+ /**
+ *
+ * @access public
+ * @static
+ * @var int
+ */
+ public static $intIdWord;
+ /**
+ *
+ * @access public
+ * @static
+ * @var Logger
+ */
+ public static $log;
+ /**
+ *
+ * @access public
+ * @static
+ * @var array
+ */
+ public static $settings = array('w:writeProtection',
+ 'w:view',
+ 'w:zoom',
+ 'w:removePersonalInformation',
+ 'w:removeDateAndTime',
+ 'w:doNotDisplayPageBoundaries',
+ 'w:displayBackgroundShape',
+ 'w:printPostScriptOverText',
+ 'w:printFractionalCharacterWidth',
+ 'w:printFormsData',
+ 'w:embedTrueTypeFonts',
+ 'w:embedSystemFonts',
+ 'w:saveSubsetFonts',
+ 'w:saveFormsData',
+ 'w:mirrorMargins',
+ 'w:alignBordersAndEdges',
+ 'w:bordersDoNotSurroundHeader',
+ 'w:bordersDoNotSurroundFooter',
+ 'w:gutterAtTop',
+ 'w:hideSpellingErrors',
+ 'w:hideGrammaticalErrors',
+ 'w:activeWritingStyle',
+ 'w:proofState',
+ 'w:formsDesign',
+ 'w:attachedTemplate',
+ 'w:linkStyles',
+ 'w:stylePaneFormatFilter',
+ 'w:stylePaneSortMethod',
+ 'w:documentType',
+ 'w:mailMerge',
+ 'w:revisionView',
+ 'w:trackRevisions',
+ 'w:doNotTrackMoves',
+ 'w:doNotTrackFormatting',
+ 'w:documentProtection',
+ 'w:autoFormatOverride',
+ 'w:styleLockTheme',
+ 'w:styleLockQFSet',
+ 'w:defaultTabStop',
+ 'w:autoHyphenation',
+ 'w:consecutiveHyphenLimit',
+ 'w:hyphenationZone',
+ 'w:doNotHyphenateCaps',
+ 'w:showEnvelope',
+ 'w:summaryLength',
+ 'w:clickAndTypeStyle',
+ 'w:defaultTableStyle',
+ 'w:evenAndOddHeaders',
+ 'w:bookFoldRevPrinting',
+ 'w:bookFoldPrinting',
+ 'w:bookFoldPrintingSheets',
+ 'w:drawingGridHorizontalSpacing',
+ 'w:drawingGridVerticalSpacing',
+ 'w:displayHorizontalDrawingGridEvery',
+ 'w:displayVerticalDrawingGridEvery',
+ 'w:doNotUseMarginsForDrawingGridOrigin',
+ 'w:drawingGridHorizontalOrigin',
+ 'w:drawingGridVerticalOrigin',
+ 'w:doNotShadeFormData',
+ 'w:noPunctuationKerning',
+ 'w:characterSpacingControl',
+ 'w:printTwoOnOne',
+ 'w:strictFirstAndLastChars',
+ 'w:noLineBreaksAfter',
+ 'w:noLineBreaksBefore',
+ 'w:savePreviewPicture',
+ 'w:doNotValidateAgainstSchema',
+ 'w:saveInvalidXml',
+ 'w:ignoreMixedContent',
+ 'w:alwaysShowPlaceholderText',
+ 'w:doNotDemarcateInvalidXml',
+ 'w:saveXmlDataOnly',
+ 'w:useXSLTWhenSaving',
+ 'w:saveThroughXslt',
+ 'w:showXMLTags',
+ 'w:alwaysMergeEmptyNamespace',
+ 'w:updateFields',
+ 'w:hdrShapeDefaults',
+ 'w:footnotePr',
+ 'w:endnotePr',
+ 'w:compat',
+ 'w:docVars',
+ 'w:rsids',
+ 'm:mathPr',
+ 'w:uiCompat97To2003',
+ 'w:attachedSchema',
+ 'w:themeFontLang',
+ 'w:clrSchemeMapping',
+ 'w:doNotIncludeSubdocsInStats',
+ 'w:doNotAutoCompressPictures',
+ 'w:forceUpgrade',
+ 'w:captions',
+ 'w:readModeInkLockDown',
+ 'w:smartTagType',
+ 'sl:schemaLibrary',
+ 'w:shapeDefaults',
+ 'w:doNotEmbedSmartTags',
+ 'w:decimalSymbol',
+ 'w:listSeparator'
+ );
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_background;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_backgroundColor;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_baseTemplateFilesPath;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_baseTemplatePath;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_baseTemplateZip;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_bookmarksIds;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $_compatibilityMode;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_contentTypeC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_defaultFont;
+ /**
+ *
+ * @access private
+ * @var Debug
+ */
+ private $_debug;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_defaultPHPDOCXStyles;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $_defaultTemplate;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $_docm;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsAppC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsAppT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsCoreC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsCoreT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsCustomC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_docPropsCustomT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private static $_encodeUTF;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_extension;
+ /**
+ *
+ * @access private
+ * @var int
+ */
+ private $_idImgHeader;
+ /**
+ *
+ * @access private
+ * @var int
+ */
+ private $_idRels;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_idWords;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_language;
+ /**
+ *
+ * @access private
+ * @var boolean
+ */
+ private $_macro;
+ /**
+ *
+ * @access private
+ * @var int
+ */
+ private $_markAsFinal;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_parsedStyles;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_phpdocxconfig;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_relsRelsC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_relsRelsT;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_relsHeader;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_relsHeaderFooterImage;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_relsHeaderFooterImageExternal;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_relsHeaderFooterLink;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_relsFooter;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_sectPr;
+ /**
+ * Directory path used for temporary files
+ *
+ * @access private
+ * @var string
+ */
+ private $_tempDir;
+ /**
+ * Path of temp file to use as DOCX file
+ *
+ * @access private
+ * @var string
+ */
+ private $_tempFile;
+ /**
+ * Paths of temps files to use as DOCX file
+ *
+ * @access private
+ * @var array
+ */
+ private $_tempFileXLSX;
+ /**
+ * Numberings used by the replaceTemplateVariabeByHTML
+ *
+ * @access private
+ * @var array
+ */
+ private $_templateNumberings;
+ /**
+ * Unique id for the insertion of new elements
+ *
+ * @access private
+ * @var string
+ */
+ private $_uniqid;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordDocumentC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordDocumentT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordDocumentStyles;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordEndnotesC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordEndnotesT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordFontTableC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordFontTableT;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordFooterC;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordFooterT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordFootnotesC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordFootnotesT;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordHeaderC;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordHeaderT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordNumberingC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordNumberingT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordRelsDocumentRelsC;
+ /**
+ *
+ * @access private
+ * @var DOMDocument
+ */
+ private $_wordRelsDocumentRelsT;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordRelsFooterRelsC;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordRelsFooterRelsT;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordRelsHeaderRelsC;
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_wordRelsHeaderRelsT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordSettingsC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordSettingsT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordStylesC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordStylesT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordThemeThemeT;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordThemeThemeC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordWebSettingsC;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordWebSettingsT;
+ /**
+ *
+ * @access private
+ * @var ZipArchive
+ */
+ private $_zipDocx;
+
+ /**
+ * Construct
+ *
+ * @access public
+ * @param string $baseTemplatePath. Optional, basicTemplate.docx as default
+ */
+ public function __construct($baseTemplatePath = PHPDOCX_BASE_TEMPLATE)
+ {
+ $this->_debug = Debug::getInstance();
+
+ $this->_phpdocxconfig = PhpdocxUtilities::parseConfig();
+
+ $this->_background = '';
+ $this->_backgroundColor = 'FFFFFF';
+ $this->_baseTemplateFilesPath;
+ if ($baseTemplatePath == 'docm') {
+ $this->_baseTemplatePath = PHPDOCX_BASE_FOLDER.'phpdocxBaseTemplate.docm';
+ $this->_docm = true;
+ $this->_defaultTemplate = true;
+ $this->_extension = 'docm';
+ } else if($baseTemplatePath == 'docx') {
+ $this->_baseTemplatePath = PHPDOCX_BASE_FOLDER.'phpdocxBaseTemplate.docx';
+ $this->_docm = false;
+ $this->_defaultTemplate = true;
+ $this->_extension = 'docx';
+ } else {
+ if ($baseTemplatePath == PHPDOCX_BASE_TEMPLATE) {
+ $this->_defaultTemplate = true;
+ } else {
+ $this->_defaultTemplate = false;
+ }
+ $this->_baseTemplatePath = $baseTemplatePath;
+ $extensionArray = explode('.', $this->_baseTemplatePath);
+ $extension = array_pop($extensionArray);
+ $this->_extension = $extension;
+ if ($extension == 'docm') {
+ $this->_docm = true;
+ } else if ($extension == 'docx') {
+ $this->_docm = false;
+ } else {
+ PhpdocxLogger::logger('Invalid base template extension', 'fatal');
+ }
+ }
+ $this->_baseTemplateZip = new ZipArchive();
+ $this->_bookmarksIds = array();
+ $this->_idRels = array();
+ $this->_idWords = array();
+ $this->_idImgHeader = 1;
+ $this->_idRels = 1;
+ self::$intIdWord = rand(9999999,99999999);
+ self::$_encodeUTF = 0;
+ $this->_language = 'en-US';
+ $this->_markAsFinal = 0;
+ $this->graphicTemplate = array();
+ $this->fileGraphicTemplate = array();
+ $this->_zipDocx = new ZipArchive();
+ if ($this->_phpdocxconfig['settings']['temp_path']) {
+ $this->_tempDir = $this->_phpdocxconfig['settings']['temp_path'];
+ } else {
+ $this->_tempDir = self::getTempDir();
+ }
+ $this->_tempFile = tempnam($this->_tempDir, 'document');
+ $this->_templateNumberings;
+ $this->_zipDocx->open($this->_tempFile, ZipArchive::OVERWRITE);
+ $this->_compatibilityMode = false;
+ PhpdocxLogger::logger('Create a temp file to use as initial ZIP file. ' .
+ 'DOCX is a ZIP file.', 'info');
+ // sign is set false as default
+ $this->_sign = false;
+ $this->_relsRelsC = '';
+ $this->_relsRelsT = '';
+ $this->_contentTypeC = '';
+ $this->_contentTypeT = NULL;
+ $this->_defaultFont = '';
+ $this->_docPropsAppC = '';
+ $this->_docPropsAppT = '';
+ $this->_docPropsCoreC = '';
+ $this->_docPropsCoreT = '';
+ $this->_docPropsCustomC = '';
+ $this->_docPropsCustomT = '';
+ $this->_macro = 0;
+ $this->_relsHeader = array();
+ $this->_relsFooter = array();
+ $this->_parsedStyles = array();
+ $this->_relsHeaderFooterImage = array();
+ $this->_relsHeaderFooterImageExternal = array();
+ $this->_relsHeaderFooterLink = array();
+ $this->_sectPr = NULL;
+ $this->_tempFileXLSX = array();
+ $this->_uniqid = 'phpdocx_'.uniqid();
+ $this->_wordDocumentT = '';
+ $this->_wordDocumentC = '';
+ $this->_wordDocumentStyles = '';
+ $this->_wordEndnotesC = '';
+ $this->_wordEndnotesT = '';
+ $this->_wordFontTableT = '';
+ $this->_wordFontTableC = '';
+ $this->_wordFooterC = array();
+ $this->_wordFooterT = array();
+ $this->_wordFootnotesC = '';
+ $this->_wordFootnotesT = '';
+ $this->_wordHeaderC = array();
+ $this->_wordHeaderT = array();
+ $this->_wordNumberingC;
+ $this->_wordNumberingT;
+ $this->_wordRelsDocumentRelsC = '';
+ $this->_wordRelsDocumentRelsT = NULL;
+ $this->_wordRelsHeaderRelsC = array();
+ $this->_wordRelsHeaderRelsT = array();
+ $this->_wordRelsFooterRelsC = array();
+ $this->_wordRelsFooterRelsT = array();
+ $this->_wordSettingsT = '';
+ $this->_wordSettingsC = '';
+ $this->_wordStylesT = '';
+ $this->_wordStylesC = '';
+ $this->_wordThemeThemeT = '';
+ $this->_wordThemeThemeC = '';
+ $this->_wordWebSettingsT = '';
+ $this->_wordWebSettingsC = '';
+ $this->_defaultPHPDOCXStyles = array('Default Paragraph Font PHPDOCX', //This is the default paragraph font style used in multiple places
+ 'List Paragraph PHPDOCX', //This is the style used for the defolt ordered and unorderd lists
+ 'Title PHPDOCX', //This style is used by the addTitle method
+ 'Subtitle PHPDOCX', //This style is used by the addTitle method
+ 'Normal Table PHPDOCX', //This style is used for the basic table
+ 'Table Grid PHPDOCX', //This style is for basic tables and is also used to embed HTML tables with border="1"
+ 'footnote text PHPDOCX', //This style is used for default footnotes
+ 'footnote text Car PHPDOCX', //The character style for footnotes
+ 'footnote reference PHPDOCX', // The style for the footnote
+ 'endnote text PHPDOCX', //This style is used for default endnotes
+ 'endnote text Car PHPDOCX', //The character style for endnotes
+ 'endnote reference PHPDOCX'); // The style for the endnote
+ //Some variables to control that some v2.4 keep working
+ $this->footerAdded = false;
+ $this->headerAdded = false;
+ self::$PHPDOCXStyles = '<w:styles xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" >
+ <w:style w:type="character" w:styleId="DefaultParagraphFontPHPDOCX">
+ <w:name w:val="Default Paragraph Font PHPDOCX"/>
+ <w:uiPriority w:val="1"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ </w:style>
+ <w:style w:type="paragraph" w:styleId="ListParagraphPHPDOCX">
+ <w:name w:val="List Paragraph PHPDOCX"/>
+ <w:basedOn w:val="Normal"/>
+ <w:uiPriority w:val="34"/>
+ <w:qFormat/>
+ <w:rsid w:val="00DF064E"/>
+ <w:pPr>
+ <w:ind w:left="720"/>
+ <w:contextualSpacing/>
+ </w:pPr>
+ </w:style>
+ <w:style w:type="paragraph" w:styleId="TitlePHPDOCX">
+ <w:name w:val="Title PHPDOCX"/>
+ <w:basedOn w:val="Normal"/>
+ <w:next w:val="Normal"/>
+ <w:link w:val="TitleCarPHPDOCX"/>
+ <w:uiPriority w:val="10"/>
+ <w:qFormat/>
+ <w:rsid w:val="00DF064E"/>
+ <w:pPr>
+ <w:pBdr>
+ <w:bottom w:val="single" w:sz="8" w:space="4" w:color="4F81BD" w:themeColor="accent1"/>
+ </w:pBdr>
+ <w:spacing w:after="300" w:line="240" w:lineRule="auto"/>
+ <w:contextualSpacing/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+ <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+ <w:spacing w:val="5"/>
+ <w:kern w:val="28"/>
+ <w:sz w:val="52"/>
+ <w:szCs w:val="52"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:customStyle="1" w:styleId="TitleCarPHPDOCX">
+ <w:name w:val="Title Car PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:link w:val="TitlePHPDOCX"/>
+ <w:uiPriority w:val="10"/>
+ <w:rsid w:val="00DF064E"/>
+ <w:rPr>
+ <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+ <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+ <w:spacing w:val="5"/>
+ <w:kern w:val="28"/>
+ <w:sz w:val="52"/>
+ <w:szCs w:val="52"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="paragraph" w:styleId="SubtitlePHPDOCX">
+ <w:name w:val="Subtitle PHPDOCX"/>
+ <w:basedOn w:val="Normal"/>
+ <w:next w:val="Normal"/>
+ <w:link w:val="SubtitleCarPHPDOCX"/>
+ <w:uiPriority w:val="11"/>
+ <w:qFormat/>
+ <w:rsid w:val="00DF064E"/>
+ <w:pPr>
+ <w:numPr>
+ <w:ilvl w:val="1"/>
+ </w:numPr>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+ <w:i/>
+ <w:iCs/>
+ <w:color w:val="4F81BD" w:themeColor="accent1"/>
+ <w:spacing w:val="15"/>
+ <w:sz w:val="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:customStyle="1" w:styleId="SubtitleCarPHPDOCX">
+ <w:name w:val="Subtitle Car PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:link w:val="SubtitlePHPDOCX"/>
+ <w:uiPriority w:val="11"/>
+ <w:rsid w:val="00DF064E"/>
+ <w:rPr>
+ <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+ <w:i/>
+ <w:iCs/>
+ <w:color w:val="4F81BD" w:themeColor="accent1"/>
+ <w:spacing w:val="15"/>
+ <w:sz w:val="24"/>
+ <w:szCs w:val="24"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="table" w:styleId="NormalTablePHPDOCX">
+ <w:name w:val="Normal Table PHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ <w:qFormat/>
+ <w:pPr>
+ <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+ </w:pPr>
+ <w:tblPr>
+ <w:tblInd w:w="0" w:type="dxa"/>
+ <w:tblCellMar>
+ <w:top w:w="0" w:type="dxa"/>
+ <w:left w:w="108" w:type="dxa"/>
+ <w:bottom w:w="0" w:type="dxa"/>
+ <w:right w:w="108" w:type="dxa"/>
+ </w:tblCellMar>
+ </w:tblPr>
+ </w:style>
+ <w:style w:type="table" w:styleId="TableGridPHPDOCX">
+ <w:name w:val="Table Grid PHPDOCX"/>
+ <w:uiPriority w:val="59"/>
+ <w:rsid w:val="00493A0C"/>
+ <w:pPr>
+ <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+ </w:pPr>
+ <w:tblPr>
+ <w:tblInd w:w="0" w:type="dxa"/>
+ <w:tblBorders>
+ <w:top w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ <w:left w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ <w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ <w:right w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ <w:insideH w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ <w:insideV w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+ </w:tblBorders>
+ <w:tblCellMar>
+ <w:top w:w="0" w:type="dxa"/>
+ <w:left w:w="108" w:type="dxa"/>
+ <w:bottom w:w="0" w:type="dxa"/>
+ <w:right w:w="108" w:type="dxa"/>
+ </w:tblCellMar>
+ </w:tblPr>
+ </w:style>
+ <w:style w:type="paragraph" w:styleId="footnoteTextPHPDOCX">
+ <w:name w:val="footnote Text PHPDOCX"/>
+ <w:basedOn w:val="Normal"/>
+ <w:link w:val="footnoteTextCarPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:pPr>
+ <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+ </w:pPr>
+ <w:rPr>
+ <w:sz w:val="20"/>
+ <w:szCs w:val="20"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:customStyle="1" w:styleId="footnoteTextCarPHPDOCX">
+ <w:name w:val="footnote Text Car PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:link w:val="footnoteTextPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:rPr>
+ <w:sz w:val="20"/>
+ <w:szCs w:val="20"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:styleId="footnoteReferencePHPDOCX">
+ <w:name w:val="footnote Reference PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:rPr>
+ <w:vertAlign w:val="superscript"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="paragraph" w:styleId="endnoteTextPHPDOCX">
+ <w:name w:val="endnote Text PHPDOCX"/>
+ <w:basedOn w:val="Normal"/>
+ <w:link w:val="endnoteTextCarPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:pPr>
+ <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+ </w:pPr>
+ <w:rPr>
+ <w:sz w:val="20"/>
+ <w:szCs w:val="20"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:customStyle="1" w:styleId="endnoteTextCarPHPDOCX">
+ <w:name w:val="endnote Text Car PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:link w:val="endnoteTextPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:rPr>
+ <w:sz w:val="20"/>
+ <w:szCs w:val="20"/>
+ </w:rPr>
+ </w:style>
+ <w:style w:type="character" w:styleId="endnoteReferencePHPDOCX">
+ <w:name w:val="endnote Reference PHPDOCX"/>
+ <w:basedOn w:val="DefaultParagraphFontPHPDOCX"/>
+ <w:uiPriority w:val="99"/>
+ <w:semiHidden/>
+ <w:unhideWhenUsed/>
+ <w:rsid w:val="006E0FDA"/>
+ <w:rPr>
+ <w:vertAlign w:val="superscript"/>
+ </w:rPr>
+ </w:style>
+ </w:styles>';
+
+ self::$unorderedListStyle = '<w:abstractNum w:abstractNumId="" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" >
+ <w:multiLevelType w:val="hybridMultilevel"/>
+ <w:lvl w:ilvl="0" w:tplc="">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="720" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="1" w:tplc="0C0A0003" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val="o"/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="1440" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:cs="Courier New" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="2" w:tplc="0C0A0005" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="2160" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="3" w:tplc="0C0A0001" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="2880" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="4" w:tplc="0C0A0003" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val="o"/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="3600" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:cs="Courier New" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="5" w:tplc="0C0A0005" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="4320" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="6" w:tplc="0C0A0001" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="5040" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="7" w:tplc="0C0A0003" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val="o"/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="5760" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Courier New" w:hAnsi="Courier New" w:cs="Courier New" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ <w:lvl w:ilvl="8" w:tplc="0C0A0005" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="bullet"/>
+ <w:lvlText w:val=""/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="6480" w:hanging="360"/>
+ </w:pPr>
+ <w:rPr>
+ <w:rFonts w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>
+ </w:rPr>
+ </w:lvl>
+ </w:abstractNum>';
+
+ self::$orderedListStyle ='<w:abstractNum w:abstractNumId="" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" >
+ <w:multiLevelType w:val="hybridMultilevel"/>
+ <w:lvl w:ilvl="0" w:tplc="">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="decimal"/>
+ <w:lvlText w:val="%1."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="720" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="1" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerLetter"/>
+ <w:lvlText w:val="%2."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="1440" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="2" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerRoman"/>
+ <w:lvlText w:val="%3."/>
+ <w:lvlJc w:val="right"/>
+ <w:pPr>
+ <w:ind w:left="2160" w:hanging="180"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="3" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="decimal"/>
+ <w:lvlText w:val="%4."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="2880" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="4" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerLetter"/>
+ <w:lvlText w:val="%5."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="3600" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="5" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerRoman"/>
+ <w:lvlText w:val="%6."/>
+ <w:lvlJc w:val="right"/>
+ <w:pPr>
+ <w:ind w:left="4320" w:hanging="180"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="6" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="decimal"/>
+ <w:lvlText w:val="%7."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="5040" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="7" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerLetter"/>
+ <w:lvlText w:val="%8."/>
+ <w:lvlJc w:val="left"/>
+ <w:pPr>
+ <w:ind w:left="5760" w:hanging="360"/>
+ </w:pPr>
+ </w:lvl>
+ <w:lvl w:ilvl="8" w:tplc="" w:tentative="1">
+ <w:start w:val="1"/>
+ <w:numFmt w:val="lowerRoman"/>
+ <w:lvlText w:val="%9."/>
+ <w:lvlJc w:val="right"/>
+ <w:pPr>
+ <w:ind w:left="6480" w:hanging="180"/>
+ </w:pPr>
+ </w:lvl>
+ </w:abstractNum>';
+
+
+ //We now try to open the zip file defined as base template
+ try {
+ $openBaseTemplate = $this->_baseTemplateZip->open($this->_baseTemplatePath);
+ if ($openBaseTemplate !== true) {
+ throw new Exception('Error while opening the Base Template: please, check the path');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ //We now extract the contents of the base template into a temp dir for further manipulation
+ try {
+ $this->_baseTemplateFilesPath = $this->_tempDir.'/'.uniqid(true);
+ $extractBaseTemplate =$this->_baseTemplateZip->extractTo($this->_baseTemplateFilesPath);
+ if ($extractBaseTemplate !== true) {
+ throw new Exception('Error while extracting the Base Template: there may be problems writing in the default tmp folder');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ //We should now check if there is any structured content as front page to include it in the resulting document
+
+ try{
+ $baseTemplateDocumentT = $this->_baseTemplateZip->getFromName('word/document.xml');
+ if ($baseTemplateDocumentT == '') {
+ throw new Exception('Error while extracting the document.xml file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ $baseDocument = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $baseDocument->loadXML($baseTemplateDocumentT);
++ libxml_disable_entity_loader($loadEntities);
+ $docXpath = new DOMXPath($baseDocument);
+ $docXpath->registerNamespace('w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+ $queryDoc = '//w:body/w:sdt';
+ $docNodes = $docXpath->query($queryDoc);
+
+ if ($docNodes->length > 0){
+ if($docNodes->item(0)->nodeName == 'w:sdt'){
+ $tempDoc = new DomDocument();
+ $sdt =$tempDoc->importNode($docNodes->item(0), true);
+ $newNode = $tempDoc->appendChild($sdt);
+ $frontPage = $tempDoc->saveXML($newNode);
+ $this->_wordDocumentC .= $frontPage;
+ }
+ }
+
+ //Let us extract now the section information to include it at the end of the document.xml file
+
+ $sectPr = $baseDocument->getElementsByTagName('sectPr')->item(0);
+ $this->_sectPr = new DOMDocument();
+ $sectNode = $this->_sectPr->importNode($sectPr, true);
+ $this->_sectPr->appendChild($sectNode);
+
+ //Let us extract the contents of the [Content_Types].xml file for further manipulation
+
+ try {
+ $baseTemplateContentTypeT = $this->_baseTemplateZip->getFromName('[Content_Types].xml');
+ if ($baseTemplateContentTypeT == '') {
+ throw new Exception('Error while extracting the [Content_Types].xml file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ $this->_contentTypeT = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $this->_contentTypeT->loadXML($baseTemplateContentTypeT);
++ libxml_disable_entity_loader($loadEntities);
+
+ //We are going to include the standard image defaults
+
+ $this->generateDEFAULT('gif', 'image/gif');
+ $this->generateDEFAULT('jpg', 'image/jpg');
+ $this->generateDEFAULT('png', 'image/png');
+ $this->generateDEFAULT('jpeg', 'image/jpeg');
+ $this->generateDEFAULT('bmp', 'image/bmp');
+
+
+ //Let us extract the document.xml.rels for further manipulation
+ try {
+ $baseTemplateDocumentRelsT = $this->_baseTemplateZip->getFromName('word/_rels/document.xml.rels');
+ if ($baseTemplateDocumentRelsT == '') {
+ throw new Exception('Error while extracting the document.xml.rels file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ $this->_wordRelsDocumentRelsT = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $this->_wordRelsDocumentRelsT->loadXML($baseTemplateDocumentRelsT);
++ libxml_disable_entity_loader($loadEntities);
+ $relationships = $this->_wordRelsDocumentRelsT->getElementsByTagName('Relationship');
+
+ //Now we have to take care of the case that the template used is not one of the default preprocessed templates
+
+ if ($this->_defaultTemplate) {
+ self::$numUL = 1;
+ self::$numOL = rand(9999, 999999999);
+
+ //Let's get the original template numbering.xml file as a DOMdocument
+ try {
+ $this->_wordNumberingT = $this->_baseTemplateZip->getFromName('word/numbering.xml');
+ if ($this->_wordNumberingT == '') {
+ throw new Exception('Error while extracting the numbering file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ } else {
+ //We should do now some cleaning of the files from the base template zip
+ //Let us first look at the document.xml.rels file to analyze the contents
+ //Let us analyze its structure
+ //In order to do that we should parse word/_rels/document.xml.rels
+ $counter = $relationships->length -1;
+
+ for ($j=$counter; $j > -1; $j--) {
+ $completeType = $relationships->item($j)->getAttribute('Type');
+ $target = $relationships->item($j)->getAttribute('Target');
+ $tempArray = explode('/', $completeType);
+ $type = array_pop($tempArray);
+ //This array holds the data that has to be changed in settings.xml
+ $arrayCleaner = array();
+
+ switch($type){
+ case 'header':
+ //TODO: this should be changed if we use default templates with headers
+ array_push($this->_relsHeader,$target);
+ break;
+ case 'footer':
+ //TODO: this should be changed if we use default templates with footers
+ array_push($this->_relsFooter,$target);
+ break;
+ case 'chart':
+ $this->recursiveDelete($this->_baseTemplateFilesPath.'/word/charts');
+ $this->_wordRelsDocumentRelsT->documentElement->removeChild($relationships->item($j));
+ break;
+ case 'embeddings':
+ $this->recursiveDelete($this->_baseTemplateFilesPath.'/word/embeddings');
+ $this->_wordRelsDocumentRelsT->documentElement->removeChild($relationships->item($j));
+ break;
+ }
+
+ }
+
+ //Let us now manage the numbering.xml and style.xml files
+ // We are going to use some default styles, for example, in the creation of lists, footnotes, titles, ...
+ // So we should make sure that it is included in the styles.xml document
+ $this->importStyles(PHPDOCX_BASE_TEMPLATE, 'merge', $this->_defaultPHPDOCXStyles);
+ //Let us first check if the base template file has a numbering.xml file
+ $numRef = rand(9999999, 99999999);
+ self::$numUL = $numRef;
+ self::$numOL = $numRef +1;
+
+ if(file_exists($this->_baseTemplateFilesPath.'/word/numbering.xml')) {
+ //Let's get the original template numbering.xml file as a DOMdocument
+ try {
+ $this->_wordNumberingT = $this->_baseTemplateZip->getFromName('word/numbering.xml');
+ if ($this->_wordNumberingT == '') {
+ throw new Exception('Error while extracting the numbering file from the base template');
+ }
+ } catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ $this->_wordNumberingT = $this->importSingleNumbering($this->_wordNumberingT, self::$unorderedListStyle, self::$numUL);
+ $this->_wordNumberingT = $this->importSingleNumbering($this->_wordNumberingT, self::$orderedListStyle, self::$numOL);
+ }else{
+ $this->_wordNumberingT = $this->generateBaseWordNumbering();
+ $this->_wordNumberingT = $this->importSingleNumbering($this->_wordNumberingT, self::$unorderedListStyle, self::$numUL);
+ $this->_wordNumberingT = $this->importSingleNumbering($this->_wordNumberingT, self::$orderedListStyle, self::$numOL);
+ //Now we should include the corresponding relationshipand Override
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . rand(99999999, 999999999), 'numbering', 'numbering.xml'
+ );
+ $this->generateOVERRIDE('/word/numbering.xml','application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml');
+ }
+
+ //Let us now make sure that there are the corresponding xmls, with all their relationships for endnotes and footnotes
+ if(!file_exists($this->_baseTemplateFilesPath.'/word/endnotes.xml') || !file_exists($this->_baseTemplateFilesPath.'/word/footnotes.xml')){
+ $notesZip = new ZipArchive();
+ try {
+ $openNotesZip = $notesZip->open(PHPDOCX_BASE_TEMPLATE);
+ if ($openNotesZip !== true){
+ throw new Exception('Error while opening the standard base template to extract the word/footnotes.xml and word/endnotes.xml file');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ $arraySettings = array();
+ if(!file_exists($this->_baseTemplateFilesPath.'/word/footnotes.xml')){
+ $notesZip->extractTo($this->_baseTemplateFilesPath, 'word/footnotes.xml');
+ //Now we should include the corresponding relationshipand Override
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . rand(99999999, 999999999), 'footnotes', 'footnotes.xml'
+ );
+ $this->generateOVERRIDE('/word/footnotes.xml','application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml');
+ array_push($arraySettings, '<w:footnotePr><w:footnote w:id="-1" /><w:footnote w:id="0" /></w:footnotePr>');
+ }
+ if(!file_exists($this->_baseTemplateFilesPath.'/word/endnotes.xml')){
+ $notesZip->extractTo($this->_baseTemplateFilesPath, 'word/endnotes.xml');
+ //Now we should include the corresponding relationshipand Override
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . rand(99999999, 999999999), 'endnotes', 'endnotes.xml'
+ );
+ $this->generateOVERRIDE('/word/endnotes.xml','application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml');
+ array_push($arraySettings,'<w:endnotePr><w:endnote w:id="-1" /><w:endnote w:id="0" /></w:endnotePr>');
+ }
+
+ //$this->includeSettings($arraySettings)
+ }
+ }
+ $this->setLanguage($this->_phpdocxconfig['settings']['language']);
+
+ }
+
+ /**
+ * Destruct
+ *
+ * @access public
+ */
+ public function __destruct()
+ {
+
+ }
+
+ /**
+ * Magic method, returns current word XML
+ *
+ * @access public
+ * @return string Return current word
+ */
+ public function __toString()
+ {
+ $this->generateTemplateWordDocument();
+ PhpdocxLogger::logger('Get document template content.', 'debug');
+ return $this->_wordDocumentT;
+ }
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setExtension($extension)
+ {
+ $this->_extension = $extension;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getExtension()
+ {
+ return $this->_extension;
+ }
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setTemporaryDirectory($tempDir)
+ {
+ $this->_tempDir = $tempDir;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getTemporaryDirectory()
+ {
+ return $this->_tempDir;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlContentTypes($xmlContentTypes)
+ {
+ $this->_contentTypeC = $xmlContentTypes;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlContentTypes()
+ {
+ return $this->_contentTypeC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlRelsRels($xmlRelsRels)
+ {
+ $this->_relsRelsC = $xmlRelsRels;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlRelsRels()
+ {
+ return $this->_relsRelsC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlDocPropsApp($xmlDocPropsApp)
+ {
+ $this->_docPropsAppC = $xmlDocPropsApp;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlDocPropsApp()
+ {
+ return $this->_docPropsAppC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlDocPropsCore($xmlDocPropsCore)
+ {
+ $this->_docPropsCoreC = $xmlDocPropsCore;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlDocPropsCore()
+ {
+ return $this->_docPropsCoreC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlDocPropsCustom($xmlDocPropsCustom)
+ {
+ $this->_docPropsCustomC = $xmlDocPropsCustom;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlDocPropsCustom()
+ {
+ return $this->_docPropsCustomC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordDocument($xmlWordDocument)
+ {
+ $this->_wordDocumentC = $xmlWordDocument;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordDocumentContent()
+ {
+ return $this->_wordDocumentC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordDocumentStyles($xmlWordDocumentStyles)
+ {
+ $this->_wordDocumentStyles = $xmlWordDocumentStyles;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordDocumentStyles()
+ {
+ return $this->_wordDocumentStyles;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordEndnotes($xmlWordEndnotes)
+ {
+ $this->_wordEndnotesC = $xmlWordEndnotes;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordEndnotes()
+ {
+ return $this->_wordEndnotesC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordFontTable($xmlWordFontTable)
+ {
+ $this->_wordFontTableC = $xmlWordFontTable;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordFontTable()
+ {
+ return $this->_wordFontTableC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordFooter1($xmlWordFooter)
+ {
+ $this->_wordFooterC = $xmlWordFooter;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordFooter1()
+ {
+ return $this->_wordFooterC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordHeader1($xmlWordHeader)
+ {
+ $this->_wordHeaderC = $xmlWordHeader;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordHeader1()
+ {
+ return $this->_wordHeaderC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordRelsDocumentRels($xmlWordRelsDocumentRels)
+ {
+ $this->_wordRelsDocumentRelsC = $xmlWordRelsDocumentRels;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordRelsDocumentRels()
+ {
+ return $this->_wordRelsDocumentRelsC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordSettings($xmlWordSettings)
+ {
+ $this->_wordSettingsC = $xmlWordSettings;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordSettings()
+ {
+ return $this->_wordSettingsC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordStyles($xmlWordStyles)
+ {
+ $this->_wordStylesC = $xmlWordStyles;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordStyles()
+ {
+ return $this->_wordStylesC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordThemeTheme1($xmlWordThemeTheme)
+ {
+ $this->_wordThemeThemeC = $xmlWordThemeTheme;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getXmlWordThemeTheme1()
+ {
+ return $this->_wordThemeThemeC;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setXmlWordWebSettings($xmlWordWebSettings)
+ {
+ $this->_wordWebSettingsC = $xmlWordWebSettings;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function getXml_Word_WebSettings()
+ {
+ return $this->_wordWebSettingsC;
+ }
+
+ /**
+ * Add a break
+ *
+ * @access public
+ * @example ../examples/easy/PageBreak.php
+ * @param string $options
+ * Values:
+ * 'type' (line, page, column)
+ */
+ public function addBreak($options = array('type' => 'line'))
+ {
+ $break = CreatePage::getInstance();
+ $break->generatePageBreak($options['type']);
+ PhpdocxLogger::logger('Add break to word document.', 'info');
+ $this->_wordDocumentC .= (string) $break;
+ }
+
+ /**
+ * Add a chart
+ *
+ * @access public
+ * @example ../examples/easy/Chart.php
+ * @example ../examples/easy/Chart_bar.php
+ * @param array $options
+ * Values: 'color' (1, 2, 3...) color scheme,
+ * 'perspective' (20, 30...),
+ * 'rotX' (20, 30...),
+ * 'rotY' (20, 30...),
+ * 'data' (array of values),
+ * 'float' (left, right, center) floating image. It only applies if textWrap is not inline (default value).
+ * 'font' (Arial, Times New Roman...),
+ * 'groupBar' (clustered, stacked, percentStacked),
+ * 'horizontalOffset' (int) given in emus (1cm = 360000 emus)
+ * 'jc' (center, left, right),
+ * 'showPercent' (0, 1),
+ * 'sizeX' (10, 11, 12...),
+ * 'sizeY' (10, 11, 12...),
+ * 'textWrap' (0 (inline), 1 (square), 2 (front), 3 (back), 4 (up and bottom)),
+ * 'verticalOffset' (int) given in emus (1cm = 360000 emus)
+ * 'title',
+ * 'type' (barChart, pieChart)
+ * 'legendPos' (r, l, t, b, none),
+ * 'legendOverlay' (0, 1),
+ * 'border' (0, 1),
+ * 'haxLabel' horizontal axis label,
+ * 'vaxLabel' vertical axis label,
+ * 'showtable' (0, 1) shows the table of values,
+ * 'vaxLabelDisplay' (rotated, vertical, horizontal),
+ * 'haxLabelDisplay' (rotated, vertical, horizontal),
+ * 'hgrid' (0, 1, 2, 3),
+ * 'vgrid' (0, 1, 2, 3),
+ * 'style' this work only in radar charts.
+ * 'gapWidth' distance between the pie and the second chart(ofpiechart)
+ * 'secondPieSize' : size of the second chart(ofpiechart)
+ * 'splitType' how decide to split the values :auto(Default Split), cust(Custom Split), percent(Split by Percentage), pos(Split by Position), val(Split by Value)
+ * 'splitPos' split position , integer or float
+ * 'custSplit' array of index to split
+ * 'subtype' type of the second chart pie or bar
+ * 'explosion' distance between the diferents values
+ * 'holeSize' size of the hole in doughnut type
+ * 'symbol' array of symbols(scatter chart)
+ * 'symbolSize' the size of the simbols
+ * 'smooth' smooth the line (scatter chart)
+ * 'wireframe' boolean(surface chart)to remove content color and only leave the border colors
+ * 'showValue' (0,1) shows the values inside the chart
+ * 'showCategory' (0,1) shows the category inside the chart
+ */
+ public function addChart($options = array())
+ {
+ PhpdocxLogger::logger('Create chart.', 'debug');
+ try {
+ if (isset($options['data']) && isset($options['type'])) {
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . Chart.', 'debug');
+ $type = $options['type'];
+ if(strpos($type, 'Chart') === false)
+ $type .= 'Chart';
+
+ $graphic = CreateChartFactory::createObject($type);
+
+ if ($graphic->createGraphic(self::$intIdWord, $options) != false) {
+ PhpdocxLogger::logger('Add chart word/charts/chart' . self::$intIdWord .
+ '.xml to DOCX.', 'info');
+ $this->_zipDocx->addFromString(
+ 'word/charts/chart' . self::$intIdWord . '.xml',
+ $graphic->getXmlChart()
+ );
+ $this->_wordRelsDocumentRelsC .=
+ $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'chart',
+ 'charts/chart' . self::$intIdWord . '.xml'
+ );
+ $this->generateDEFAULT('xlsx', 'application/octet-stream');
+ $this->generateOVERRIDE(
+ '/word/charts/chart' . self::$intIdWord . '.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'drawingml.chart+xml'
+ );
+ } else {
+ throw new Exception(
+ 'There was an error related to the chart.'
+ );
+ }
+ $excel = $graphic->getXlsxType();
+
+ $this->_tempFileXLSX[self::$intIdWord] =
+ tempnam($this->_tempDir, 'documentxlsx');
+ if (
+ $excel->createXlsx(
+ $this->_tempFileXLSX[self::$intIdWord],
+ $options['data']
+ ) != false
+ ) {
+ $this->_zipDocx->addFile(
+ $this->_tempFileXLSX[self::$intIdWord],
+ 'word/embeddings/datos' . self::$intIdWord . '.xlsx'
+ );
+
+ $chartRels = CreateChartRels::getInstance();
+ $chartRels->createRelationship(self::$intIdWord);
+ $this->_zipDocx->addFromString(
+ 'word/charts/_rels/chart' . self::$intIdWord .
+ '.xml.rels',
+ (string) $chartRels
+ );
+ }
+ $this->_wordDocumentC .= (string) $graphic;
+ } else {
+ throw new Exception(
+ 'Images must have "data" and "type" values.'
+ );
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Add an image
+ *
+ * @access public
+ * @example ../examples/easy/Image.php
+ * @param array $data
+ * Values:
+ * 'border'(int) 1, 2, 3...
+ * 'borderDiscontinuous' (0, 1)
+ * 'float' (left, right, center) floating image. It only applies if textWrap is not inline (default value).
+ * 'font' (string) Arial, Times New Roman...
+ * 'horizontalOffset' (int) given in emus (1cm = 360000 emus). Only applies if there is the image is not floating
+ * 'jc' (center, left, right, inside, outside)
+ * 'name' (string) path to a local image
+ * 'scaling' (int) 50, 100, ..
+ * 'sizeX' (int) 10, 11, 12...
+ * 'sizeY' (int) 10, 11, 12...
+ * 'dpi' (int) dots per inch
+ * 'spacingTop' (int) 10, 11...
+ * 'spacingBottom' (int) 10, 11...
+ * 'spacingLeft' (int) 10, 11...
+ * 'spacingRight' (int) 10, 11...
+ * 'textWrap' 0 (inline), 1 (square), 2 (front), 3 (back), 4 (up and bottom))
+ * 'target' (string): document (default value), defaultHeader, firstHeader, evenHeader, defaultFooter, firstFooter, evenFooter
+ * 'verticalOffset' (int) given in emus (1cm = 360000 emus)
+ */
+ public function addImage($data = '')
+ {
+ if(!isset($data['target'])){
+ $data['target'] = 'document';
+ }
+ PhpdocxLogger::logger('Create image.', 'debug');
+ try {
+ if (isset($data['name']) && file_exists($data['name']) == 'true') {
+ $attrImage = getimagesize($data['name']);
+ try {
+ if ($attrImage['mime'] == 'image/jpg' ||
+ $attrImage['mime'] == 'image/jpeg' ||
+ $attrImage['mime'] == 'image/png' ||
+ $attrImage['mime'] == 'image/gif'
+ ) {
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID rId' . self::$intIdWord . ' . Image.', 'debug');
+ $image = CreateImage::getInstance();
+ $data['rId'] = self::$intIdWord;
+ $image->createImage($data);
+ $dir = $this->parsePath($data['name']);
+ PhpdocxLogger::logger('Add image word/media/imgrId' .
+ self::$intIdWord . '.' . $dir['extension'] .
+ '.xml to DOCX.', 'info');
+ $this->_zipDocx->addFile(
+ $data['name'], 'word/media/imgrId' .
+ self::$intIdWord . '.' .
+ $dir['extension']
+ );
+ $this->generateDEFAULT(
+ $dir['extension'], $attrImage['mime']
+ );
+ if ((string) $image != ''){
+ //Here we consider the case where the image will be included in a header or footer
+ if($data['target'] == 'defaultHeader' ||
+ $data['target'] == 'firstHeader' ||
+ $data['target'] == 'evenHeader' ||
+ $data['target'] == 'defaultFooter' ||
+ $data['target'] == 'firstFooter' ||
+ $data['target'] == 'evenFooter'){
+ $this->_relsHeaderFooterImage[$data['target']][] =
+ array('rId' => 'rId' . self::$intIdWord, 'extension' => $dir['extension']);
+ }else{
+ $this->_wordRelsDocumentRelsC .=
+ $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'image',
+ 'media/imgrId' . self::$intIdWord . '.'
+ . $dir['extension']
+ );
+ }
+ }
+ $this->_wordDocumentC .= (string) $image;
+ } else {
+ throw new Exception('Image format is not supported.');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ } else {
+ throw new Exception('Image does not exist.');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Add a link
+ *
+ * @access public
+ * @example ../examples/easy/Link.php
+ * @param array $options
+ * @see addText
+ * additional parameter:
+ * 'url' (string) URL or #bookmarkName
+ *
+ */
+ public function addLink($text, $options = array('url' => '',
+ 'font' => '',
+ 'sz' => '',
+ 'color' => '0000ff',
+ 'u' => 'single',
+ ))
+ {
+ if(substr($options['url'], 0, 1) == '#'){
+ $url = 'HYPERLINK \l "' . substr($options['url'], 1) . '"';
+ }else{
+ $url = 'HYPERLINK "' . $options['url'] . '"';
+ }
+ if ($text == '') {
+ PhpdocxLogger::logger('The linked text is missing', 'fatal');
+ } else if($options['url'] == '') {
+ PhpdocxLogger::logger('The URL is missing', 'fatal');
+ }
+ if (isset($options['color'])) {
+ $color = $options['color'];
+ } else {
+ $color = '0000ff';
+ }
+ if (isset($options['u'])) {
+ $u = $options['u'];
+ } else {
+ $u = 'single';
+ }
+ $textOptions = $options;
+ $textLink = CreateText::getInstance();
+ $textLink->createText($text, $textOptions);
+ $link = (string) $textLink;
+ $link = preg_replace('/__[A-Z]+__/', '', $link);
+ $startNodes ='<w:r><w:fldChar w:fldCharType="begin" /></w:r><w:r>
+ <w:instrText xml:space="preserve">'.$url.'</w:instrText>
+ </w:r><w:r><w:fldChar w:fldCharType="separate" /></w:r>';
+ if(strstr($link, '</w:pPr>')){
+ $link = preg_replace('/<\/w:pPr>/', '</w:pPr>'.$startNodes, $link);
+ }else{
+ $link = preg_replace('/<w:p>/', '<w:p>'.$startNodes, $link);
+ }
+ $endNode = '<w:r><w:fldChar w:fldCharType="end" /></w:r>';
+ $link = preg_replace('/<\/w:p>/', $endNode . '</w:p>', $link);
+ PhpdocxLogger::logger('Add link to word document.', 'info');
+ $this->_wordDocumentC .= (string) $link;
+ }
+
+ /**
+ * Add a list
+ *
+ * @access public
+ * @example ../examples/easy/List.php
+ * @param array $data Values of the list
+ * @param array $options
+ * Values:
+ * 'font' (string), Arial, Times New Roman, ...
+ * 'val' (int), 0 (clear), 1 (inordinate), 2(numerical)
+ * 'bullets' (array) 1 (), 2 (o), 3 ()
+ */
+ public function addList($data, $options = array())
+ {
+ $list = CreateList::getInstance();
+
+ if ($options['val'] == 2){
+ self::$numOL++;
+ $this->_wordNumberingT = $this->importSingleNumbering($this->_wordNumberingT, self::$orderedListStyle, self::$numOL);
+ }
+ $list->createList($data, $options);
+ PhpdocxLogger::logger('Add list to word document.', 'info');
+ $this->_wordDocumentC .= (string) $list;
+
+ if (!empty($options['bullets'])
+ && is_array($options['bullets'])
+ && $options['val'] == 1
+ ) {
+ for ($i = 0; $i <= CreateList::MAXDEPTH; $i++) {
+ $bullets = $options['bullets'];
+ if (isset($bullets[$i])) {
+ $styleId = $bullets[$i];
+ } else {
+ $styleId = $i;
+ }
+ $list->createListStyles($i, $styleId);
+ PhpdocxLogger::logger('Add list styles to word document.', 'info');
+ $this->_wordDocumentStyles .= (string) $list;
+ }
+ }
+ }
+
+ /**
+ * Add a raw WordML
+ *
+ * @access public
+ * @param string $wml WordML to add
+ * @deprecated See addWordML
+ */
+ public function addRawWordML($wml)
+ {
+ PhpdocxLogger::logger('Add raw WordML.', 'info');
+ $this->_wordDocumentC .= $wml;
+ }
+
+ /**
+ * Add a table.
+ *
+ * @access public
+ * @example ../examples/easy/Table.php
+ * @param array $tableData an array of arrays with the table data organized by rows
+ * Each cell content may be a string or array.
+ * If the cell contents are in the form of an array its keys and posible values are:
+ * 'value' (string)
+ * 'rowspan' (int)
+ * 'colspan' (int)
+ * 'width' (int) in twentieths of a point
+ * 'border' (none, single, double, dashed, threeDEngrave, threeDEmboss, outset, inset)
+ * 'border_color' (ffffff, ff0000)
+ * 'border_spacing' (0, 1, 2...)
+ * 'border_sz' (10, 11...) in eights of a point
+ * 'border_<side>' (none, single, double, dashed, threeDEngrave, threeDEmboss, outset, inset) where the side may be: top, left, right or bottom
+ * 'border_<side>_color' (ffffff, ff0000)
+ * 'border_<side>_spacing' (0, 1, 2...)
+ * 'border_<side>_sz' (10, 11...)
+ * 'background_color' (ffffff, ff0000)
+ * 'noWrap' (boolean)
+ * 'cellMargin' (mixed) an integer value or an array:
+ * 'top' (int) in twentieths of a point
+ * 'right' (int) in twentieths of a point
+ * 'bottom' (int) in twentieths of a point
+ * 'left' (int) in twentieths of a point
+ * 'textDirection' (string) available values are: tbRl and btLr
+ * 'fitText' (boolean) if true fits the text to the size of the cell
+ * 'vAlign' (string) vertical align of text: top, center, both or bottom
+ *
+ * @param array $tableProperties Parameters to use
+ * Values:
+ * 'border' (none, single, double, dashed, threeDEngrave, threeDEmboss, outset, inset)
+ * 'border_color' (ffffff, ff0000)
+ * 'border_spacing' (0, 1, 2...)
+ * 'border_sz' (10, 11...) in eights of a point
+ * 'border_settings' (all, outside, inside) if all (default value) the border styles apply to all table borders.
+ * If the value is set to outside or inside the border styles will only apply to the outside or inside boreders respectively.
+ * 'cantSplitRows' (boolean) set global row split properties (can be overriden by rowProperties)
+ * 'cellMargin' (array) the keys are top, right, bottom and left and the values is given in twips (twentieths of a point)
+ * 'cellSpacing' (int) given in twips (twentieths of a point)
+ * 'float' (array) with the following keys and values:
+ * 'textMargin_top' (int) in twentieths of a point
+ * 'textMargin_right' (int) in twentieths of a point
+ * 'textMargin_bottom' (int) in twentieths of a point
+ * 'textMargin_left' (int) in twentieths of a point
+ * 'align' (string) posible values are: left, center, right, outside, inside
+ * 'font' (Arial, Times New Roman...)
+ * 'indent' (int) given in twips (twentieths of a point)
+ * 'jc' (center, left, right)
+ * 'decimalTab'
+ * 'size_col': column width fix (int)
+ * column width variable (array)
+ * 'tableWidth' (array) its posible keys and values are:
+ * 'type' (pct, dxa) pct if the value refers to percentage and dxa if the value is given in twentieths of a point (twips)
+ * 'value' (int)
+ * 'TBLSTYLEval' (string) Word table style
+ *
+ * @param array $rowProperties (array) a cero based array. Each entry is an array with keys and values:
+ * 'cantSplit' (boolean)
+ * 'minHeight' (int) in twentieths of a point
+ * 'height' (int) in twentieths of a point
+ * 'tblHeader' (boolean) if true this row repeats at the beguinning of each new page
+ */
+ public function addTable($tableData, $tableProperties= array(), $rowProperties = array())
+ {
+ $table = CreateTable::getInstance();
+ $table->createTable($tableData, $tableProperties, $rowProperties);
+ PhpdocxLogger::logger('Add table to Word document.', 'info');
+ $this->_wordDocumentC .= (string) $table;
+ }
+
+ /**
+ * Add a text
+ *
+ * @access public
+ * @example ../examples/easy/Text.php
+ * @example ../examples/easy/Text_cursive.php
+ * @param mixed $textParams if a string just the text to be included, if an
+ * array is or an array of arrays with each element containing
+ * the text to be inserted and their formatting properties
+ * Array values:
+ * 'text' (string) the run of text to be inserted
+ * 'b' (on, off)
+ * 'caps' (on, off) display text in capital letters
+ * 'color' (ffffff, ff0000...)
+ * 'columnBreak' (before, after, both) inserts a column break before, after or both, a run of text
+ * 'font' (Arial, Times New Roman...)
+ * 'i' (on, off)
+ * 'lineBreak' (before, after, both) inserts a line break before, after or both, a run of text
+ * 'sz' (1, 2, 3...)
+ * 'tab' (boolean) inserts a tab. Default value is false
+ * 'spaces': number of spaces at the beguinning of the run of text
+ * 'u' (none, dash, dotted, double, single, wave, words)
+ * @param array $paragraphParams Style options to apply to the whole paragraph
+ * Values:
+ * 'pStyle' (string) Word style to be used. Run parseStyles() to check all available paragraph styles
+ * 'b' (on, off)
+ * 'caps' (on, off) display text in capital letters
+ * 'color' (ffffff, ff0000...)
+ * 'contextualSpacing' (on, off) ignore spacing above and below when using identical styles
+ * 'font' (Arial, Times New Roman...)
+ * 'i' (on, off)
+ * 'indent_left' 100...,
+ * 'indent_right' 100...
+ * 'jc' (both, center, distribute, left, right)
+ * 'keepLines' (on, off) keep all paragraph lines on the same page
+ * 'keepNext' (on, off) keep in the same page the current paragraph with next paragraph
+ * 'lineSpacing' 120, 240 (standard), 360, 480, ...
+ * 'pageBreakBefore' (on, off)
+ * 'spacingBottom' (int) bottom margin in twentieths of a point
+ * 'spacingTop' (int) top margin in twentieths of a point
+ * 'sz' (8, 9, 10, ...) size in points
+ * 'tabPositions' (array) each entry is an associative array with the following keys and values
+ * 'type' (string) can be clear, left (default), center, right, decimal, bar and num
+ * 'leader' (string) can be none (default), dot, hyphen, underscore, heavy and middleDot
+ * 'position' (int) given in twentieths of a point
+ * if there is a tab and the tabPositions array is not defined the standard tab position (default of 708) will be used
+ * 'textDirection' (lrTb, tbRl, btLr, lrTbV, tbRlV, tbLrV) text flow direction
+ * 'u' (none, dash, dotted, double, single, wave, words)
+ * 'widowControl' (on, off)
+ */
+ public function addText($textParams, $paragraphParams = array())
+ {
+ $text = CreateText::getInstance();
+ $text->createText($textParams, $paragraphParams);
+ PhpdocxLogger::logger('Add text to word document.', 'info');
+ $this->_wordDocumentC .= (string) $text;
+ }
+
+ /**
+ * Generate a new DOCX file
+ *
+ * @access public
+ * @example ../examples/easy/Text.php
+ * @param string $args[0] File name
+ * @param string $args[1] Page style
+ * Values: 'bottom' (4000, 4001...), 'columns' (1, 2, 3), 'left' (4000, 4001...),
+ * 'orient' (landscape), 'right' (4000, 4001), 'titlePage' (1),
+ * 'top' (4000, 4001)
+ */
+ public function createDocx()
+ {
+ $args = func_get_args();
+ if (!empty($args[0])) {
+ $fileName = $args[0];
+ } else {
+ $fileName = 'document';
+ }
+ PhpdocxLogger::logger('Set DOCX name to: ' . $fileName . '.', 'info');
+ PhpdocxLogger::logger('DOCX is a new file, not a template.', 'debug');
+ //We copy the rels content into the respective file
+ $relsHandler = fopen($this->_baseTemplateFilesPath.'/word/_rels/document.xml.rels', "w+");
+ fwrite($relsHandler, $this->_wordRelsDocumentRelsT->saveXML());
+ fclose($relsHandler);
+ //We also copy the contents of the [Content_types].xml file
+ $contentTypesHandler = fopen($this->_baseTemplateFilesPath.'/[Content_Types].xml', "w+");
+ fwrite($contentTypesHandler, $this->_contentTypeT->saveXML());
+ fclose($contentTypesHandler);
+ $arrArgsPage = array();
+ $this->generateTemplateWordDocument($arrArgsPage);
+ if ($this->_debug->getActive() == 1) {
+ PhpdocxLogger::logger('Debug is active, add messages to objDebug.', 'debug');
+ libxml_use_internal_errors(true);
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ simplexml_load_string(
+ $this->_wordDocumentT, 'SimpleXMLElement', LIBXML_NOWARNING
- );
++ );
++ libxml_disable_entity_loader($loadEntities);
+ $xmlErrors = libxml_get_errors();
+ if (is_array($xmlErrors)) {
+ $this->_debug->addMessage($xmlErrors);
+ libxml_clear_errors();
+ }
+ }
+ PhpdocxLogger::logger('Add word/document.xml content to DOCX file.', 'info');
+ $documentHandler = fopen($this->_baseTemplateFilesPath.'/word/document.xml', "w+");
+ if (self::$_encodeUTF) {
+ $contentDocumentXML = utf8_encode($this->_wordDocumentT);
+ //TODO: sot out encoding problems
+ fwrite($documentHandler, utf8_encode($this->_wordDocumentT));
+ } else {
+ if ($this->_phpdocxconfig['settings']['encode_to_UTF8'] == 'true' && !PhpdocxUtilities::isUtf8($this->_wordDocumentT)) {
+ $contentDocumentXML = utf8_encode($this->_wordDocumentT);
+ } else {
+ $contentDocumentXML = $this->_wordDocumentT;
+ }
+ fwrite($documentHandler, $this->_wordDocumentT);
+ }
+ fclose($documentHandler);
+ if($this->_wordFootnotesC != ''){
+ PhpdocxLogger::logger('Add word/footnote.xml content to DOCX file.', 'info');
+ $footnoteHandler = fopen($this->_baseTemplateFilesPath.'/word/footnote.xml', "w+");
+ if (self::$_encodeUTF) {
+ //TODO: sot out encoding problems
+ fwrite($footnoteHandler, utf8_encode($this->_wordFootnotesT));
+ } else {
+ if ($this->_phpdocxconfig['settings']['encode_to_UTF8'] == 'true') {
+ if (!PhpdocxUtilities::isUtf8($this->_wordFootnotesT)) {
+ $this->_wordFootnotesT = utf8_encode($this->_wordFootnotesT);
+ }
+ }
+ fwrite($footnoteHandler, $this->_wordFootnotesT);
+ }
+ fclose($documentHandler);
+ }
+ $numberingHandler = fopen($this->_baseTemplateFilesPath.'/word/numbering.xml', "w+");
+ fwrite($numberingHandler, $this->_wordNumberingT);
+ fclose($numberingHandler);
+ PhpdocxLogger::logger('Close ZIP file', 'info');
+ $this->recursiveInsert($this->_zipDocx, $this->_baseTemplateFilesPath, $this->_baseTemplateFilesPath);
+ //Lets now insert the photos inserted by the embedHTML method
+ if (is_dir($this->_baseTemplateFilesPath.'/word/mediaTemplate')){
+ $contentsDir = scandir($this->_baseTemplateFilesPath.'/word/mediaTemplate');
+ $predefinedExtensions = explode(',', PHPDOCX_ALLOWED_IMAGE_EXT);
+ foreach($contentsDir as $element){
+ $arrayExtension = explode('.', $element);
+ $extension = strtolower(array_pop($arrayExtension));
+ if (in_array($extension, $predefinedExtensions)){
+ $this->_zipDocx->addFile($this->_baseTemplateFilesPath.'/word/mediaTemplate/'.$element, 'word/media/'.$element);
+ }
+ //Now we remove the image from the mediaTemplate folder
+ $this->_zipDocx->deleteName('word/mediaTemplate/'.$element);
+ }
+ //And now we delete the mediaTemplate folder
+ $deleteMediaTemplate = $this->_zipDocx->deleteName('word/mediaTemplate/');
+ }
+ //Check if there are openbookmars and if so throw an error
+ if (count($this->_bookmarksIds) > 0) {
+ PhpdocxLogger::logger('There are unclosed bookmarks. Please, check that all open bookmarks tags are properly closed.', 'fatal');
+ }
+ $this->_zipDocx->close();
+ $arrpathFile = pathinfo($fileName);
+ PhpdocxLogger::logger('Copy DOCX file using a new name.', 'info');
+ copy(
+ $this->_tempFile,
+ $fileName . '.' . $this->_extension
+ );
+ if ($this->_debug->getActive() == 1) {
+ PhpdocxLogger::logger('Debug is active, show messages.', 'debug');
+ echo $this->_debug;
+ }
+ // delete temp file
+ if (is_file($this->_tempFile) && is_writable($this->_tempFile)) {
+ unlink($this->_tempFile);
+ }
+ }
+
+ /**
+ *
+ * Transform a word document to a text file
+ *
+ * @example ../examples/easy/Docx2Text.php
+ * @param string $path. Path to the docx from which we wish to import the content
+ * @param string $path. Path to the text file output
+ * @param array styles.
+ * keys: table => true/false,list => true/false, paragraph => true/false, footnote => true/false, endnote => true/false, chart => (0=false,1=array,2=table)
+ */
+ public static function docx2txt($from, $to, $options = array()) {
+ $text = new Docx2Text($options);
+ $text->setDocx($from);
+ $text->extract($to);
+ }
+
+ /**
+ * Imports an existing style sheet from an existing docx document.
+ *
+ * @access private
+ * @param string $path. Must be a valid path to an existing .docx, .dotx o .docm document
+ * @param string $type. You may choose 'replace' (overwrites the current styles) or 'merge' (adds the selected styles)
+ * @param array $myStyles. A list of specific styles to be merged. If it is empty or the choosen type is 'replace' it will be ignored.
+ */
+ private function importStyles($path, $type= 'replace', $myStyles= array(), $styleIdentifier = 'styleName')
+ {
+ $zipStyles = new ZipArchive();
+ try {
+ $openStyle = $zipStyles->open($path);
+ if ($openStyle !== true) {
+ throw new Exception('Error while opening the Style Template: please, check the path');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ if ($type == 'replace') {
+ //Now we overwrite the original styles file
+ try {
+ $extractingStyleFile = $zipStyles->extractTo($this->_baseTemplateFilesPath.'/','word/styles.xml');
+ if (!$extractingStyleFile) {
+ throw new Exception('Error while trying to overwrite the styles.xml of the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ //In order not to loose certain styles needed for certain PHPDOCX methods we should merge them
+ $this->importStyles(PHPDOCX_BASE_TEMPLATE, 'merge', $this->_defaultPHPDOCXStyles);
+ } else {
+ //We will first extract the new styles from the external docx
+ try {
+ $newStyles = $zipStyles->getFromName('word/styles.xml');
+ if ($newStyles == '') {
+ throw new Exception('Error while extracting the styles from the external docx');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ //let's parse the different styles via XPath
+ $newStylesDoc = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $newStylesDoc->loadXML($newStyles);
++ libxml_disable_entity_loader($loadEntities);
+ $stylesXpath = new DOMXPath($newStylesDoc);
+ $stylesXpath->registerNamespace('w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+ $queryStyle = '//w:style';
+ $styleNodes = $stylesXpath->query($queryStyle);
+
+ //Let's get the original styles as a DOMdocument
+ try{
+ $styleHandler = fopen($this->_baseTemplateFilesPath.'/word/styles.xml', 'r');
+ $styleXML = fread($styleHandler, filesize($this->_baseTemplateFilesPath.'/word/styles.xml'));
+ fclose($styleHandler);
+ $this->_wordStylesT = $styleXML;
+ if ($styleXML == '') {
+ throw new Exception('Error while extracting the style file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ $stylesDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $stylesDocument->loadXML($this->_wordStylesT);
++ libxml_disable_entity_loader($loadEntities);
+ $baseNode = $stylesDocument->documentElement;
+ $stylesDocumentXPath = new DOMXPath($stylesDocument);
+ $stylesDocumentXPath->registerNamespace('w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+ $query = '//w:style';
+ $originalNodes = $stylesDocumentXPath->query($query);
+
+ //Now we start to insert the new styles at the end of the styles.xml
+ foreach($styleNodes as $node){
+ // in order to avoid duplicated Ids we first remove from the
+ // original styles.xml any duplicity with the new ones
+ // TODO: check performance
+ foreach($originalNodes as $oldNode){
+ if($styleIdentifier == 'styleID'){
+ if($oldNode->getAttribute('w:styleId') == $node->getAttribute('w:styleId')
+ && in_array($oldNode->getAttribute('w:styleId'), $myStyles)){
+ $oldNode->parentNode->removeChild($oldNode);
+ }
+ }else{
+ $oldName = $oldNode->getElementsByTagName('w:name');
+ if($oldNode->getAttribute('w:styleId') == $node->getAttribute('w:styleId')
+ && in_array($oldName, $myStyles)){
+ $oldNode->parentNode->removeChild($oldNode);
+ }
+ }
+ }
+ if(count($myStyles)>0){
+ //Lets insert the selected styles
+ if($styleIdentifier == 'styleID'){
+ if(in_array($node->getAttribute('w:styleId'), $myStyles)){
+ $insertNode = $stylesDocument->importNode($node, true);
+ $baseNode->appendChild($insertNode);
+ }
+ }else{
+ $nodeChilds = $node->childNodes;
+ foreach($nodeChilds as $child){
+ if ($child->nodeName == 'w:name'){
+ $styleName = $child->getAttribute('w:val');
+ if(in_array($styleName, $myStyles)){
+ $insertNode = $stylesDocument->importNode($node, true);
+ $baseNode->appendChild($insertNode);
+ }
+ }
+ }
+ }
+ }else{
+ $insertNode = $stylesDocument->importNode($node, true);
+ $baseNode->appendChild($insertNode);
+ }
+ }
+ $this->_wordStylesT = $stylesDocument->saveXML();
+ try {
+ $stylesFile=fopen($this->_baseTemplateFilesPath.'/word/styles.xml', 'w');
+ if ($stylesFile == false) {
+ throw new Exception('Error while opening the base template styles.xml file');
+ }
+ } catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ try {
+ $writeStyles = fwrite($stylesFile,$this->_wordStylesT);
+ if ($writeStyles == 0) {
+ throw new Exception('There were no new styles written');
+ }
+ } catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ }
+ PhpdocxLogger::logger('Importing styles from an external docx.', 'info');
+ }
+
+ /**
+ * Imports an existing theme from an existing docx document.
+ *
+ * @access private
+ * @param string $path. Must be a valid path to an existing .docx, .dotx o .docm document
+ */
+ private function importThemeXML($path){
+ try {
+ $zipTheme = new ZipArchive();
+ $extractingThemeFile = $zipTheme->extractTo($this->_baseTemplateFilesPath.'/','word/theme/theme1.xml');
+ if (!$extractingThemeFile) {
+ throw new Exception('Error while trying to overwrite the theme1.xml of the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Imports an existing webSettings.xml file from an existing docx document.
+ *
+ * @access private
+ * @param string $path. Must be a valid path to an existing .docx, .dotx o .docm document
+ */
+ private function importWebSettingsXML($path){
+ try {
+ $zipWebSettings = new ZipArchive();
+ $extractingWebSettingsFile = $zipTheme->extractTo($this->_baseTemplateFilesPath.'/','word/webSettings.xml');
+ if (!$extractingWebSettingsFile) {
+ throw new Exception('Error while trying to overwrite the webSettings.xml of the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Imports an existing settings.xml file from an existing docx document.
+ *
+ * @access private
+ * @param string $path. Must be a valid path to an existing .docx, .dotx o .docm document
+ */
+ private function importSettingsXML($path){
+ try {
+ $zipSettings = new ZipArchive();
+ $extractingSettingsFile = $zipTheme->extractTo($this->_baseTemplateFilesPath.'/','word/settings.xml');
+ if (!$extractingSettingsFile) {
+ throw new Exception('Error while trying to overwrite the settings.xml of the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Imports an existing fontTable.xml file from an existing docx document.
+ *
+ * @access private
+ * @param string $path. Must be a valid path to an existing .docx, .dotx o .docm document
+ */
+ private function importFontTableXML($path){
+ try {
+ $zipFontTable = new ZipArchive();
+ $extractingFontTableFile = $zipTheme->extractTo($this->_baseTemplateFilesPath.'/','word/fontTable.xml');
+ if (!$extractingFontTableFile) {
+ throw new Exception('Error while trying to overwrite the fontTable.xml of the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ }
+
+ /**
+ * Transform to UTF-8 charset
+ *
+ * @access public
+ */
+ public function setEncodeUTF8()
+ {
+ self::$_encodeUTF = 1;
+ }
+
+ /**
+ * Change default language.
+ * @example ../examples/easy/Language.php
+ * @param $lang Locale: en-US, es-ES...
+ * @access public
+ */
+ public function setLanguage($lang = null)
+ {
+ if (!$lang) {
+ $lang = 'en-US';
+ }
+ //Let's get the original styles as a DOMdocument
+ try{
+ $styleHandler = fopen($this->_baseTemplateFilesPath.'/word/styles.xml', 'r');
+ $styleXML = fread($styleHandler, 10000000);
+ fclose($styleHandler);
+ $this->_wordStylesT = $styleXML;
+ if ($styleXML == '') {
+ throw new Exception('Error while extracting the style file from the base template to stablish default language');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ $stylesDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $stylesDocument->loadXML($this->_wordStylesT);
++ libxml_disable_entity_loader($loadEntities);
+ $langNode = $stylesDocument->getElementsByTagName('lang');
+ $langNode->item(0)->setAttribute('w:val', $lang);
+ $langNode->item(0)->setAttribute('w:eastAsia', $lang);
+
+ $this->_wordStylesT = $stylesDocument->saveXML();
+ try {
+ $stylesFile=fopen($this->_baseTemplateFilesPath.'/word/styles.xml', 'w');
+ if ($stylesFile == false) {
+ throw new Exception('Error while opening the base template styles.xml file');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+ try {
+ $writeStyles = fwrite($stylesFile,$this->_wordStylesT );
+ if ($writeStyles == 0) {
+ throw new Exception('There was an error while trying to set the default language');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ PhpdocxLogger::logger('Set language.', 'info');
+ }
+
+ /**
+ * Add style
+ *
+ * @param string lang Language
+ * @access private
+ */
+ private function addStyle($lang = 'en-US')
+ {
+ $style = CreateStyle::getInstance();
+ $style->createStyle($lang);
+ PhpdocxLogger::logger('Add styles to styles document.', 'info');
+ $this->_wordStylesC .= (string) $style;
+ }
+
+ /**
+ * Imports styles into the template stylesheet.
+ *
+ * @access private
+ * @param string $templateStyles
+ * @param DOMDocument $importedStylesheet
+ */
+ private function addStylesTemplate($templateStyles, $importedStylesheet)
+ {
+
+ $templateStylesheet = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $templateStylesheet->loadXML($templateStyles);
++ libxml_disable_entity_loader($loadEntities);
+ //let's parse the different styles via XPath
+
+ $stylesXpath = new DOMXPath($importedStylesheet);
+ $stylesXpath->registerNamespace('w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+ $queryStyle = '//w:style';
+ $styleNodes = $stylesXpath->query($queryStyle);
+
+ //Let's get the original styles as a DOMNode
+ $stylesDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $stylesDocument->loadXML($templateStyles);
++ libxml_disable_entity_loader($loadEntities);
+ $baseNode = $stylesDocument->documentElement;
+
+ //Now we start to insert the new styles at the end of the styles.xml
+ foreach ($styleNodes as $node) {
+ // in order to avoid duplicated Ids we first remove from the
+ // original styles any duplicity with the new ones
+ $originalNodes = $stylesDocument->childNodes;
+ foreach($originalNodes as $oldNode) {
+ if ($oldNode->getAttribute('w:styleId') == $node->getAttribute('w:styleId')) {
+ $oldNode->parent->removeChild($oldNode);
+ }
+ }
+ $insertNode = $stylesDocument->importNode($node, true);
+ $baseNode->appendChild($insertNode);
+ }
+ PhpdocxLogger::logger('Importing styles into the template stylesheet.', 'info');
+
+ return $stylesDocument->saveXML();
+ }
+
+ /**
+ * Generate content type
+ *
+ * @access private
+ */
+ private function generateContentType()
+ {
+ $this->generateDEFAULT(
+ 'rels', 'application/vnd.openxmlformats-package.relationships+xml'
+ );
+ $this->generateDEFAULT('xml', 'application/xml');
+ $this->generateDEFAULT('htm', 'application/xhtml+xml');
+ $this->generateDEFAULT('rtf', 'application/rtf');
+ $this->generateDEFAULT('zip', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml');
+ $this->generateDEFAULT('mht', 'message/rfc822');
+ $this->generateDEFAULT('wml', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml');
+ $this->generateOVERRIDE(
+ '/word/numbering.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.' .
+ 'numbering+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/styles.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml' .
+ '.styles+xml'
+ );
+ $this->generateOVERRIDE(
+ '/docProps/app.xml',
+ 'application/vnd.openxmlformats-officedocument.extended-' .
+ 'properties+xml'
+ );
+ $this->generateOVERRIDE(
+ '/docProps/custom.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'custom-properties+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/settings.xml', 'application/' .
+ 'vnd.openxmlformats-officedocument.wordprocessingml.settings+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/theme/theme1.xml',
+ 'application/vnd.openxmlformats-officedocument.theme+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/fontTable.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.' .
+ 'fontTable+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/webSettings.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml' .
+ '.webSettings+xml'
+ );
+ if ($this->_wordFooterC != '' || $this->_wordHeaderC != '') {
+ $this->generateOVERRIDE(
+ '/word/header.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'wordprocessingml.header+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/footer.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'wordprocessingml.footer+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/footnotes.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'wordprocessingml.footnotes+xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/endnotes.xml',
+ 'application/vnd.openxmlformats-officedocument.' .
+ 'wordprocessingml.endnotes+xml'
+ );
+ }
+ $this->generateOVERRIDE(
+ '/docProps/core.xml',
+ 'application/vnd.openxmlformats-package.core-properties+xml'
+ );
+ }
+
+ /**
+ * Generate DEFAULT
+ *
+ * @access private
+ */
+ private function generateDEFAULT($extension, $contentType)
+ {
+ $strContent = $this->_contentTypeT->saveXML();
+ if (
+ strpos($strContent, 'Extension="' . $extension)
+ === false
+ ) {
+ $strContentTypes = '<Default Extension="'.$extension .'" ContentType="'. $contentType .'"> </Default>';
+ $tempNode = $this->_contentTypeT->createDocumentFragment();
+ $tempNode->appendXML($strContentTypes);
+ $this->_contentTypeT->documentElement->appendChild($tempNode);
+ }
+ }
+
+ /**
+ *
+ *
+ * @access private
+ */
+ private function generateDefaultFonts()
+ {
+ $font = array(
+ 'name' => 'Calibri', 'pitch' => 'variable', 'usb0' => 'A00002EF',
+ 'usb1' => '4000207B', 'usb2' => '00000000', 'usb3' => '00000000',
+ 'csb0' => '0000009F', 'csb1' => '00000000', 'family' => 'swiss',
+ 'charset' => '00', 'panose1' => '020F0502020204030204'
+ );
+ $this->addFont($font);
+ $font = array(
+ 'name' => 'Times New Roman', 'pitch' => 'variable',
+ 'usb0' => 'E0002AEF', 'usb1' => 'C0007841', 'usb2' => '00000009',
+ 'usb3' => '00000000', 'csb0' => '000001FF', 'csb1' => '00000000',
+ 'family' => 'roman', 'charset' => '00',
+ 'panose1' => '02020603050405020304'
+ );
+ $this->addFont($font);
+ $font = array(
+ 'name' => 'Cambria', 'pitch' => 'variable', 'usb0' => 'A00002EF',
+ 'usb1' => '4000004B', 'usb2' => '00000000', 'usb3' => '00000000',
+ 'csb0' => '0000009F', 'csb1' => '00000000', 'family' => 'roman',
+ 'charset' => '00', 'panose1' => '02040503050406030204'
+ );
+ $this->addFont($font);
+ }
+
+ /**
+ * Generate DefaultWordRels
+ *
+ * @access private
+ */
+ private function generateDefaultWordRels()
+ {
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . numbering.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'numbering', 'numbering.xml'
+ );
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . theme/theme1.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'theme', 'theme/theme1.xml'
+ );
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . numbering.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'webSettings', 'webSettings.xml'
+ );
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . webSettings.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'fontTable', 'fontTable.xml'
+ );
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . fontTable.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'settings', 'settings.xml'
+ );
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . settings.xml.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'styles', 'styles.xml'
+ );
+ }
+
+
+ /**
+ * Generate OVERRIDE
+ *
+ * @access private
+ * @param string $partName
+ * @param string $contentType
+ */
+ private function generateOVERRIDE($partName, $contentType)
+ {
+ $strContent = $this->_contentTypeT->saveXML();
+ if (
+ strpos($strContent, 'PartName="' . $partName . '"')
+ === false
+ ) {
+ $strContentTypes = '<Override PartName="'.$partName.'" ContentType="'.$contentType.'" />';
+ $tempNode = $this->_contentTypeT->createDocumentFragment();
+ $tempNode->appendXML($strContentTypes);
+ $this->_contentTypeT->documentElement->appendChild($tempNode);
+ }
+ }
+
+ /**
+ * Generate RELATIONSHIP
+ *
+ * @access private
+ */
+ private function generateRELATIONSHIP()
+ {
+ $arrArgs = func_get_args();
+ if ($arrArgs[1] == 'vbaProject') {
+ $type =
+ 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+ } else {
+ $type =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships/' . $arrArgs[1];
+ }
+
+ if (!isset($arrArgs[3])) {
+ $nodeWML = '<Relationship Id="' . $arrArgs[0] . '" Type="' . $type .
+ '" Target="' . $arrArgs[2] . '"></Relationship>';
+
+ } else {
+ $nodeWML = '<Relationship Id="' . $arrArgs[0] . '" Type="' . $type .
+ '" Target="' . $arrArgs[2] . '" ' . $arrArgs[3] .
+ '></Relationship>';
+ }
+ $relsNode = $this->_wordRelsDocumentRelsT->createDocumentFragment();
+ $relsNode->appendXML($nodeWML);
+ $this->_wordRelsDocumentRelsT->documentElement->appendChild($relsNode);
+
+
+ }
+
+ /**
+ * Gnerate RELATIONSHIP
+ *
+ * @access private
+ */
+ private function generateRELATIONSHIPTemplate()
+ {
+ $arrArgs = func_get_args();
+ if ($arrArgs[1] == 'vbaProject') {
+ $type =
+ 'http://schemas.microsoft.com/office/2006/relationships/vbaProject';
+ } else {
+ $type =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships/' . $arrArgs[1];
+ }
+
+ if (!isset($arrArgs[3])) {
+ $nodeWML = '<Relationship Id="' . $arrArgs[0] . '" Type="' . $type .
+ '" Target="' . $arrArgs[2] . '"></Relationship>';
+
+ } else {
+ $nodeWML = '<Relationship Id="' . $arrArgs[0] . '" Type="' . $type .
+ '" Target="' . $arrArgs[2] . '" ' . $arrArgs[3] .
+ '></Relationship>';
+ }
+
+ return $nodeWML;
+ }
+
+ /**
+ * Generate SECTPR
+ *
+ * @access private
+ * @param array $args Section style
+ */
+ private function generateSECTPR($args = '')
+ {
+ $page = CreatePage::getInstance();
+ $page->createSECTPR($args);
+ $this->_wordDocumentC .= (string) $page;
+ }
+
+ /**
+ * Generates an element in settings.xml
+ *
+ * @access private
+ */
+ private function generateSetting($tag)
+ {
+ if((!in_array($tag, self::$settings))){
+ self::$log->fatal('Incorrect setting tag');
+ }
+ $settingIndex = array_search($tag, self::$settings);
+ try{
+ $settings = fopen($this->_baseTemplateFilesPath.'/word/settings.xml', "r");
+ $baseTemplateSettingsT = fread($settings, 1000000);
+ fclose($settings);
+ if ($baseTemplateSettingsT == '') {
+ throw new Exception('Error while extracting settings.xml file from the base template to insert the selected element');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ $this->_wordSettingsT = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $this->_wordSettingsT->loadXML($baseTemplateSettingsT);
++ libxml_disable_entity_loader($loadEntities);
+ $selectedElements = $this->_wordSettingsT->documentElement->getElementsByTagName($tag);
+ if($selectedElements->length == 0){
+ $settingsElement = $this->_wordSettingsT->createDocumentFragment();
+ $settingsElement->appendXML('<' . $tag . ' xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" />');
+ $childNodes = $this->_wordSettingsT->documentElement->childNodes;
+ $index = false;
+ foreach($childNodes as $node){
+ $name = $node->nodeName;
+ $index = array_search($node->nodeName, self::$settings);
+ if($index > $settingIndex){
+ $node->parentNode->insertBefore($settingsElement, $node);
+ break;
+ }
+ }
+ //in case no node was found (pretty unlikely)we should append the node
+ if (!$index) {
+ $this->_wordSettingsT->documentElement->appendChild($settingsElement);
+ }
+ $newSettings = $this->_wordSettingsT->saveXML();
+ $settingsHandle = fopen($this->_baseTemplateFilesPath.'/word/settings.xml', "w+");
+ $contents = fwrite($settingsHandle, $newSettings);
+ fclose($settingsHandle);
+ }
+
+ }
+
+ /**
+ * Generate ContentType XML template
+ *
+ * @access private
+ */
+ private function generateTemplateContentType()
+ {
+ $this->_wordContentTypeT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>' .
+ '<Types xmlns="http://schemas.openxmlformats.org/package/2006/' .
+ 'content-types">' . $this->_contentTypeC . '</Types>';
+ }
+
+ /**
+ * Generate DocPropsApp XML template
+ *
+ * @access private
+ */
+ private function generateTemplateDocPropsApp()
+ {
+ $this->_docPropsAppT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Properties xmlns="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/extended-properties" xmlns:vt="' .
+ 'http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'docPropsVTypes"><Template>Normal.dotm</Template><TotalTime>' .
+ '0</TotalTime><Pages>1</Pages><Words>1</Words><Characters>1'
+ . '</Characters><Application>Microsoft Office Word</Application>' .
+ '<DocSecurity>4</DocSecurity><Lines>1</Lines><Paragraphs>1' .
+ '</Paragraphs><ScaleCrop>false</ScaleCrop>';
+ if ($this->_docPropsAppC) {
+ $this->_docPropsAppT .= $this->_docPropsAppC;
+ } else {
+ $this->_docPropsAppT .= '<Company>Company</Company>';
+ }
+ $this->_docPropsAppT .= '<LinksUpToDate>false</LinksUpToDate>' .
+ '<CharactersWithSpaces>1</CharactersWithSpaces><SharedDoc>' .
+ 'false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged>' .
+ '<AppVersion>12.0000</AppVersion></Properties>';
+ }
+
+ /**
+ * Generate DocPropsCore XML template
+ *
+ * @access private
+ */
+ private function generateTemplateDocPropsCore()
+ {
+ date_default_timezone_set('UTC');
+ if ($this->_markAsFinal) {
+ $this->_docPropsCoreT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats' .
+ '.org/package/2006/metadata/core-properties" ' .
+ 'xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms' .
+ '="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl' .
+ '.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XML' .
+ 'Schema-instance"><dc:title>Title</dc:title><dc:subject>' .
+ 'Subject</dc:subject><dc:creator>2mdc</dc:creator>' .
+ '<dc:description>Description</dc:description>' .
+ '<cp:lastModifiedBy>user</cp:lastModifiedBy><cp:revision>1' .
+ '</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">' .
+ date('c') . '</dcterms:created><dcterms:modified ' .
+ 'xsi:type="dcterms:W3CDTF">' . date('c') .
+ '</dcterms:modified><cp:contentStatus>Final' .
+ '</cp:contentStatus></cp:coreProperties>';
+ } else {
+ $this->_docPropsCoreT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?> ' .
+ '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats' .
+ '.org/package/2006/metadata/core-properties" ' .
+ 'xmlns:dc="http://purl.org/dc/elements/1.1/" ' .
+ 'xmlns:dcterms="http://purl.org/dc/terms/" ' .
+ 'xmlns:dcmitype="http://purl.org/dc/dcmitype/" ' .
+ 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' .
+ '<dc:title>Title</dc:title><dc:subject>Subject</dc:subject>' .
+ '<dc:creator>2mdc</dc:creator><dc:description>Description' .
+ '</dc:description><cp:lastModifiedBy>user' .
+ '</cp:lastModifiedBy><cp:revision>1</cp:revision>' .
+ '<dcterms:created xsi:type="dcterms:W3CDTF">' . date('c') .
+ '</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF' .
+ '">' . date('c') . '</dcterms:modified></cp:coreProperties>';
+ }
+ }
+
+ /**
+ * Generate DocPropsCustom XML template
+ *
+ * @access private
+ */
+ private function generateTemplateDocPropsCustom()
+ {
+ $this->_docPropsCustomT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Properties xmlns="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/custom-properties" xmlns:vt="http://' .
+ 'schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">' .
+ '<property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" ' .
+ 'pid="2" name="_MarkAsFinal"><vt:bool>true</vt:bool></property>' .
+ '</Properties>';
+ }
+
+ /**
+ * Generate RelsRels XML template
+ *
+ * @access private
+ */
+ private function generateTemplateRelsRels()
+ {
+ $this->_relsRelsT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Relationships xmlns="http://schemas.openxmlformats.org/package/' .
+ '2006/relationships">' .
+ $this->generateRELATIONSHIP(
+ 'rId3', 'extended-properties', 'docProps/app.xml'
+ ) .
+ '<Relationship Id="rId2" Type="http://schemas.openxmlformats' .
+ '.org/package/2006/relationships/metadata/core-properties"' .
+ ' Target="docProps/core.xml"/>' .
+ $this->generateRELATIONSHIP(
+ 'rId1', 'officeDocument', 'word/document.xml'
+ );
+ if ($this->_markAsFinal) {
+ $this->_relsRelsT .=
+ '<Relationship Id="rId4" Type="http://schemas' .
+ '.openxmlformats.org/officeDocument/2006/relationships/' .
+ 'custom-properties" Target="docProps/custom.xml"/>';
+ }
+ $this->_relsRelsT .= '</Relationships>';
+ }
+
+ /**
+ * Generate WordDocument XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordDocument()
+ {
+ $arrArgs = func_get_args();
+ //$this->generateSECTPR($arrArgs[0]);
+ $this->_wordDocumentC .= $this->_sectPr->saveXML($this->_sectPr->documentElement);//FIXME: I am insertying by hand the sections of the base template
+ if (!empty($this->_wordHeaderC)) {
+ $this->_wordDocumentC = str_replace(
+ '__GENERATEHEADERREFERENCE__',
+ '<' . CreateDocx::NAMESPACEWORD . ':headerReference ' .
+ CreateDocx::NAMESPACEWORD . ':type="default" r:id="rId' .
+ $this->_idWords['header'] . '"></' .
+ CreateDocx::NAMESPACEWORD . ':headerReference>',
+ $this->_wordDocumentC
+ );
+ }
+ if (!empty($this->_wordFooterC)) {
+ $this->_wordDocumentC = str_replace(
+ '__GENERATEFOOTERREFERENCE__',
+ '<' . CreateDocx::NAMESPACEWORD . ':footerReference ' .
+ CreateDocx::NAMESPACEWORD . ':type="default" r:id="rId' .
+ $this->_idWords['footer'] . '"></' .
+ CreateDocx::NAMESPACEWORD . ':footerReference>',
+ $this->_wordDocumentC
+ );
+ }
+ $this->_wordDocumentT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<' . CreateDocx::NAMESPACEWORD . ':document xmlns:ve=' .
+ '"http://schemas.openxmlformats.org/markup-compatibility/2006" ' .
+ 'xmlns:o="urn:schemas-microsoft-com:office:office"' .
+ ' xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006' .
+ '/relationships" xmlns:m="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml"'.
+ ' xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/' .
+ 'wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:' .
+ 'office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas' .
+ '.microsoft.com/office/word/2006/wordml">' .
+ $this->_background.
+ '<' . CreateDocx::NAMESPACEWORD . ':body>' .
+ $this->_wordDocumentC .
+ '</' . CreateDocx::NAMESPACEWORD . ':body>' .
+ '</' . CreateDocx::NAMESPACEWORD . ':document>';
+ }
+
+ /**
+ * Generate WordEndnotes XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordEndnotes()
+ {
+ $this->_wordEndnotesT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<' . CreateDocx::NAMESPACEWORD . ':endnotes xmlns:ve' .
+ '="http://schemas.openxmlformats.org/markup-compatibility/2006" ' .
+ 'xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="' .
+ 'http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships" xmlns:m="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:' .
+ 'vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006' .
+ '/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:' .
+ 'office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas' .
+ '.microsoft.com/office/word/2006/wordml">' .
+ $this->_wordEndnotesC .
+ '</' . CreateDocx::NAMESPACEWORD . ':endnotes>';
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . Endnotes.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'endnotes', 'endnotes.xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/endnotes.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml' .
+ '.endnotes+xml'
+ );
+ }
+
+ /**
+ * Generate WordFontTable XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordFontTable()
+ {
+ $this->_wordFontTableT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>' .
+ '<' . CreateDocx::NAMESPACEWORD . ':fonts xmlns:r="http://' .
+ 'schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main">' . $this->_wordFontTableC .
+ '</' . CreateDocx::NAMESPACEWORD . ':fonts>';
+ }
+
+ /**
+ * Generate WordFooter XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordFooter()
+ {
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . Footer.', 'debug');
+ $this->_idWords['footer'] = self::$intIdWord;
+ $this->_wordFooterT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <' . CreateDocx::NAMESPACEWORD . ':ftr xmlns:ve' .
+ '="http://schemas.openxmlformats.org/markup-compatibility/' .
+ '2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns' .
+ ':r="http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships" xmlns:m="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml' .
+ '" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/' .
+ 'wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:' .
+ 'office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas' .
+ '.microsoft.com/office/word/2006/wordml">' . $this->_wordFooterC .
+ '</' . CreateDocx::NAMESPACEWORD . ':ftr>';
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'footer', 'footer.xml'
+ );
+
+ return 'rId' . self::$intIdWord;
+ }
+
+ /**
+ * Generate WordFootnotes XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordFootnotes()
+ {
+ $this->_wordFootnotesT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<' . CreateDocx::NAMESPACEWORD . ':footnotes xmlns:ve="' .
+ 'http://schemas.openxmlformats.org/markup-compatibility/2006" ' .
+ 'xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="' .
+ 'http://schemas.openxmlformats.org/officeDocument/2006/' .
+ 'relationships" xmlns:m="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:' .
+ 'vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006' .
+ '/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:' .
+ 'office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft' .
+ '.com/office/word/2006/wordml">' . $this->_wordFootnotesC .
+ '</' . CreateDocx::NAMESPACEWORD . ':footnotes>';
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . Footnotes.', 'debug');
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'footnotes', 'footnotes.xml'
+ );
+ $this->generateOVERRIDE(
+ '/word/footnotes.xml',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml' .
+ '.footnotes+xml'
+ );
+ }
+
+ /**
+ * Generate WordHeader XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordHeader()
+ {
+ self::$intIdWord++;
+ PhpdocxLogger::logger('New ID ' . self::$intIdWord . ' . Header.', 'debug');
+ $this->_idWords['header'] = self::$intIdWord;
+ $this->_wordHeaderT = '<?xml version="1.0" encoding="UTF-8" ' .
+ 'standalone="yes"?>' .
+ '<' . CreateDocx::NAMESPACEWORD .
+ ':hdr xmlns:ve="http://schemas.openxmlformats.org/markup' .
+ '-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:' .
+ 'office:office" xmlns:r="http://schemas.openxmlformats.org/' .
+ 'officeDocument/2006/relationships" xmlns:m="http://schemas' .
+ '.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:' .
+ 'schemas-microsoft-com:vml" xmlns:wp="http://schemas' .
+ '.openxmlformats.org/drawingml/2006/wordprocessingDrawing" ' .
+ 'xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="' .
+ 'http://schemas.openxmlformats.org/wordprocessingml/2006/' .
+ 'main" xmlns:wne="http://schemas.microsoft.com/office/word/' .
+ '2006/wordml"> ' . $this->_wordHeaderC .
+ '</' . CreateDocx::NAMESPACEWORD . ':hdr>';
+ $this->_wordRelsDocumentRelsC .= $this->generateRELATIONSHIP(
+ 'rId' . self::$intIdWord, 'header', 'header.xml'
+ );
+ return 'rId' . self::$intIdWord;
+ }
+
+ /**
+ * Generate WordNumbering XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordNumbering()
+ {
+ $this->_wordNumberingT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<w:numbering xmlns:ve="http://schemas.openxmlformats' .
+ '.org/markup-compatibility/2006" xmlns:o="urn:schemas-' .
+ 'microsoft-com:office:office" xmlns:r="http://schemas' .
+ '.openxmlformats.org/officeDocument/2006/relationships" ' .
+ 'xmlns:m="http://schemas.openxmlformats.org/officeDocument/' .
+ '2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:' .
+ 'wp="http://schemas.openxmlformats.org/drawingml/2006/' .
+ 'wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com' .
+ ':office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas.' .
+ 'microsoft.com/office/word/2006/wordml"><w:abstractNum w:'
+ . 'abstractNumId="0"><w:nsid w:val="713727AE"/><w:multiLevelType' .
+ ' w:val="hybridMultilevel"/><w:tmpl w:val="F0B4B6B8"/>' .
+ '<w:lvl w:ilvl="0" w:tplc="0C0A0001"><w:start w:val="1"/>' .
+ '<w:numFmt w:val="bullet"/><w:lvlText w:val=""/><w:lvlJc ' .
+ 'w:val="left"/><w:pPr><w:ind w:left="720" w:hanging="360"/>' .
+ '</w:pPr><w:rPr><w:rFonts w:ascii="Symbol" w:hAnsi="Symbol" ' .
+ 'w:hint="default"/></w:rPr></w:lvl><w:lvl w:ilvl="1" ' .
+ 'w:tplc="0C0A0003" w:tentative="1"><w:start w:val="1"/>' .
+ '<w:numFmt w:val="bullet"/><w:lvlText w:val="o"/><w:lvlJc ' .
+ 'w:val="left"/><w:pPr><w:ind w:left="1440" w:hanging="360"/>' . '
+ </w:pPr><w:rPr><w:rFonts w:ascii="Courier New" w:hAnsi=' .
+ '"Courier New" w:cs="Courier New" w:hint="default"/></w:rPr>' .
+ '</w:lvl><w:lvl w:ilvl="2" w:tplc="0C0A0005" w:tentative="1">' .
+ '<w:start w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText ' .
+ 'w:val=""/><w:lvlJc w:val="left"/><w:pPr><w:ind w:left="2160" ' .
+ 'w:hanging="360"/></w:pPr><w:rPr><w:rFonts w:ascii="Wingdings" ' .
+ 'w:hAnsi="Wingdings" w:hint="default"/></w:rPr></w:lvl><w:lvl ' .
+ 'w:ilvl="3" w:tplc="0C0A0001" w:tentative="1"><w:start ' .
+ 'w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val=""/>' .
+ '<w:lvlJc w:val="left"/><w:pPr><w:ind w:left="2880" w:hanging=' .
+ '"360"/></w:pPr><w:rPr><w:rFonts w:ascii="Symbol" w:hAnsi=' .
+ '"Symbol" w:hint="default"/></w:rPr></w:lvl><w:lvl w:ilvl="4" ' .
+ 'w:tplc="0C0A0003" w:tentative="1"><w:start w:val="1"/>' .
+ '<w:numFmt w:val="bullet"/><w:lvlText w:val="o"/><w:lvlJc ' .
+ 'w:val="left"/><w:pPr><w:ind w:left="3600" w:hanging="360"/>' .
+ '</w:pPr><w:rPr><w:rFonts w:ascii="Courier New" w:hAnsi=' .
+ '"Courier New" w:cs="Courier New" w:hint="default"/></w:rPr>' .
+ '</w:lvl><w:lvl w:ilvl="5" w:tplc="0C0A0005" w:tentative="1">' .
+ '<w:start w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText ' .
+ 'w:val=""/><w:lvlJc w:val="left"/><w:pPr><w:ind w:left="4320" ' .
+ 'w:hanging="360"/></w:pPr><w:rPr><w:rFonts w:ascii="Wingdings" ' .
+ 'w:hAnsi="Wingdings" w:hint="default"/></w:rPr></w:lvl><w:lvl ' .
+ 'w:ilvl="6" w:tplc="0C0A0001" w:tentative="1"><w:start ' .
+ 'w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val=""/>' .
+ '<w:lvlJc w:val="left"/><w:pPr><w:ind w:left="5040" ' .
+ 'w:hanging="360"/></w:pPr><w:rPr><w:rFonts w:ascii="Symbol" ' .
+ 'w:hAnsi="Symbol" w:hint="default"/></w:rPr></w:lvl><w:lvl ' .
+ 'w:ilvl="7" w:tplc="0C0A0003" w:tentative="1"><w:start ' .
+ 'w:val="1"/><w:numFmt w:val="bullet"/><w:lvlText w:val="o"/>' .
+ '<w:lvlJc w:val="left"/><w:pPr><w:ind w:left="5760" ' .
+ 'w:hanging="360"/></w:pPr><w:rPr><w:rFonts w:ascii="Courier New" ' .
+ 'w:hAnsi="Courier New" w:cs="Courier New" w:hint="default"/>' .
+ '</w:rPr></w:lvl><w:lvl w:ilvl="8" w:tplc="0C0A0005" ' .
+ 'w:tentative="1"><w:start w:val="1"/><w:numFmt w:val="bullet"' .
+ '/><w:lvlText w:val=""/><w:lvlJc w:val="left"/><w:pPr><w:ind ' .
+ 'w:left="6480" w:hanging="360"/></w:pPr><w:rPr><w:rFonts ' .
+ 'w:ascii="Wingdings" w:hAnsi="Wingdings" w:hint="default"/>' .
+ '</w:rPr></w:lvl></w:abstractNum><w:num w:numId="1">' .
+ '<w:abstractNumId w:val="0"/></w:num></w:numbering>';
+ }
+
+ /**
+ * Generate WordNumbering XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordNumberingStyles()
+ {
+ $this->_wordNumberingT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<w:numbering xmlns:ve="http://schemas.openxmlformats' .
+ '.org/markup-compatibility/2006" xmlns:o="urn:schemas-' .
+ 'microsoft-com:office:office" xmlns:r="http://schemas' .
+ '.openxmlformats.org/officeDocument/2006/relationships" ' .
+ 'xmlns:m="http://schemas.openxmlformats.org/officeDocument/' .
+ '2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:' .
+ 'wp="http://schemas.openxmlformats.org/drawingml/2006/' .
+ 'wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com' .
+ ':office:word" xmlns:w="http://schemas.openxmlformats.org/' .
+ 'wordprocessingml/2006/main" xmlns:wne="http://schemas.' .
+ 'microsoft.com/office/word/2006/wordml"><w:abstractNum w:'
+ . 'abstractNumId="0"><w:nsid w:val="713727AE"/><w:multiLevelType' .
+ ' w:val="hybridMultilevel"/><w:tmpl w:val="F0B4B6B8"/>' .
+ $this->_wordDocumentStyles . '</w:abstractNum><w:num w:numId="1">' .
+ '<w:abstractNumId w:val="0"/></w:num></w:numbering>';
+ }
+
+ /**
+ * Generate WordRelsDocumentRels XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordRelsDocumentRels()
+ {
+ $this->_wordRelsDocumentRelsT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Relationships xmlns="http://schemas.openxmlformats.org/' .
+ 'package/2006/relationships">' . $this->_wordRelsDocumentRelsC .
+ '</Relationships>';
+ }
+
+ /**
+ * Generate WordRelsFooterRels XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordRelsFooterRels()
+ {
+ $this->_wordRelsFooterRelsT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Relationships xmlns="http://schemas.openxmlformats.org/' .
+ 'package/2006/relationships">' . $this->_wordRelsFooterRelsC .
+ '</Relationships>';
+ }
+
+ /**
+ * Generate WordRelsHeaderRels XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordRelsHeaderRels()
+ {
+ $this->_wordRelsHeaderRelsT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' .
+ '<Relationships xmlns="http://schemas.openxmlformats.org/' .
+ 'package/2006/relationships">' . $this->_wordRelsHeaderRelsC .
+ '</Relationships>';
+ }
+
+ /**
+ * Generate WordSettings XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordSettings()
+ {
+ $this->_wordSettingsT = $this->_wordSettingsC;
+ }
+
+ /**
+ * Generate WordStyles XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordStyles()
+ {
+ $this->_wordStylesT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><' .
+ CreateDocx::NAMESPACEWORD . ':styles xmlns:r="http://' .
+ 'schemas.openxmlformats.org/officeDocument/2006/relationships' .
+ '" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/' .
+ '2006/main">' . $this->_wordStylesC .
+ '</' . CreateDocx::NAMESPACEWORD . ':styles>';
+ }
+
+ /**
+ * Generate WordThemeTheme1 XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordThemeTheme1()
+ {
+ $this->addTheme($this->_defaultFont);
+ $this->_wordThemeThemeT =
+ '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><' .
+ CreateTheme1::NAMESPACEWORD . ':theme xmlns:a="http://' .
+ 'schemas.openxmlformats.org/drawingml/2006/main" name="' .
+ 'Tema de Office">' . $this->_wordThemeThemeC .
+ '</' . CreateTheme1::NAMESPACEWORD . ':theme>';
+ }
+
+ /**
+ * Generate WordWebSettings XML template
+ *
+ * @access private
+ */
+ private function generateTemplateWordWebSettings()
+ {
+ $this->_wordWebSettingsT = $this->_wordWebSettingsC;
+ }
+
+ /**
+ * Generates a TitlePg element in SectPr
+ *
+ * @access private
+ */
+ private function generateTitlePg()
+ {
+ $foundNodes = $this->_sectPr->documentElement->getElementsByTagName('w:TitlePg');
+ if($foundNodes->length == 0){
+ $newSectNode = '<w:titlePg xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" />';
+ $sectNode = $this->_sectPr->createDocumentFragment();
+ $sectNode->appendXML($newSectNode);
+ $refNode =$this->_sectPr->documentElement->appendChild($sectNode);
+ }
+ }
+
+ /**
+ * To add support of sys_get_temp_dir for PHP versions under 5.2.1
+ *
+ * @access private
+ * @return string
+ */
+ public static function getTempDir() {
+ if ( !function_exists('sys_get_temp_dir')) {
+ function sys_get_temp_dir() {
+ if ($temp = getenv('TMP')) {
+ return $temp;
+ }
+ if ($temp = getenv('TEMP')) {
+ return $temp;
+ }
+ if ($temp = getenv('TMPDIR')) {
+ return $temp;
+ }
+ $temp = tempnam(__FILE__,'');
+ if (file_exists($temp)) {
+ unlink($temp);
+ return dirname($temp);
+ }
+ return null;
+ }
+ } else {
+ return sys_get_temp_dir();
+ }
+ }
+
+ /**
+ * Parse path dir
+ *
+ * @access private
+ * @param string $dir Directory path
+ */
+ private function parsePath($dir)
+ {
+ $slash = 0;
+ $path = '';
+ if (($slash = strrpos($dir, '/')) !== false) {
+ $slash += 1;
+ $path = substr($dir, 0, $slash);
+ }
+ $punto = strpos(substr($dir, $slash), '.');
+
+ $nombre = substr($dir, $slash, $punto);
+ $extension = substr($dir, $punto + $slash + 1);
+ return array(
+ 'path' => $path, 'nombre' => $nombre, 'extension' => $extension
+ );
+ }
+
+ /**
+ * Delete a file or recursively delete a directory
+ *
+ * @param string $str path to file or directory
+ */
+ private function recursiveDelete($str){
+ if(is_file($str)){
+ return @unlink($str);
+ }
+ elseif(is_dir($str)){
+ $scan = glob(rtrim($str,'/').'/*');
+ foreach($scan as $index=>$path){
+ $this->recursiveDelete($path);
+ }
+ return @rmdir($str);
+ }
+ }
+
+
+ /**
+ *
+ * Adds directory contents recursively into a zip.
+ *
+ * @param string $fileName. The path to the dir to add.
+ *
+ * @param string $myZip. The zip where the contents of the dir should be added.
+ *
+ */
+ private function recursiveInsert($myZip, $fileName, $basePath){
+ $length = strlen($basePath);
+ if(is_dir($fileName)){
+ $contentsDir = scandir($fileName);
+ foreach($contentsDir as $element){
+ if($element != "." && $element !=".."){
+ $this->recursiveInsert($myZip, $fileName."/".$element, $basePath);
+ }
+ }
+ }else{
+ $newName = substr($fileName, $length + 1);
+ $myZip->addFile($fileName, $newName);
+ }
+ }
+
+ /**
+ *
+ * Includes data in the setting.xml file.
+ *
+ * @param array $settings. The string with the nodes that should be included in the settings.xml file.
+ *
+ */
+ private function includeSettings($data){
+ try{
+ $baseSettings = $this->_baseTemplateZip->getFromName('word/settings.xml');
+ if ($baseSettings == '') {
+ throw new Exception('Error while extracting the settings.xml file from the base template');
+ }
+ }
+ catch (Exception $e) {
+ PhpdocxLogger::logger($e->getMessage(), 'fatal');
+ }
+
+ $settingsDoc = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $settingsDoc->loadXML($baseSettings);
++ libxml_disable_entity_loader($loadEntities);
+ $settings = $settingsDoc->documentElement;
+
+ foreach($data as $key => $value){
+ $newNode = $settingsDoc->createDocumentFragment();
+ $newNode->appendXML($value);
+ $settings->appendChild($newNode);
+ }
+
+ $settingsHandler = fopen($this->_baseTemplateFilesPath.'/word/settings.xml', "w+");
+ fwrite($settingsHandler, $settingsDoc->saveXML());
+ fclose($documentHandler);
+ }
+}
diff --cc 3rdparty/phpdocx/classes/CreateMath.inc
index 1af3461,0000000..906957f
mode 100644,000000..100644
--- a/3rdparty/phpdocx/classes/CreateMath.inc
+++ b/3rdparty/phpdocx/classes/CreateMath.inc
@@@ -1,143 -1,0 +1,144 @@@
+<?php
+
+/**
+ * Add a math eq
+ *
+ * @category Phpdocx
+ * @package elements
+ * @copyright Copyright (c) Narcea Producciones Multimedia S.L.
+ * (http://www.2mdc.com)
+ * @license LGPL
+ * @version 3.0
+ * @link http://www.phpdocx.com
+ * @since File available since Release 3.0
+ */
+include_once dirname(__FILE__) . '/CreateElement.inc';
+
+class CreateMath extends CreateElement
+{
+
+ /**
+ *
+ * @access private
+ * @static
+ */
+ private static $_instance = null;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_mathML;
+
+ /**
+ * Construct
+ *
+ * @access public
+ */
+ public function __construct()
+ {
+
+ }
+
+ /**
+ * Destruct
+ *
+ * @access public
+ */
+ public function __destruct()
+ {
+
+ }
+
+ /**
+ * Magic method, returns current MathML
+ *
+ * @access public
+ * @return string Return current MathML
+ */
+ public function __toString()
+ {
+ return $this->_mathML;
+ }
+
+ /**
+ * Singleton, return instance of class
+ *
+ * @access public
+ * @return CreateLink
+ */
+ public static function getInstance()
+ {
+ if (self::$_instance == NULL) {
+ self::$_instance = new CreateMath();
+ }
+ return self::$_instance;
+ }
+
+ /**
+ * Getter. Access to mathXML var
+ *
+ * @access public
+ * @return string
+ */
+ public function getMathXML()
+ {
+ return $this->_mathML;
+ }
+
+
+ /**
+ * Getter. Access to mathXML var
+ *
+ * @access public
+ * @param string $mathML
+ */
+ public function setMathXML($mathML)
+ {
+ $this->_mathML = $mathML;
+ }
+
+ /**
+ * Generate a new MathML eq
+ *
+ * @access public
+ * @param string $arrArgs[0] Math eq
+ */
+ public function createMath()
+ {
+ $this->_xml = '';
+ $arrArgs = func_get_args();
+
+ $this->transformMath($arrArgs[0]);
+ }
+
+ /**
+ * Transform a MathML eq using XSL
+ *
+ * @access protected
+ * @param string $mathML Math eq
+ */
+ protected function transformMath($mathML)
+ {
+ $arrDeleteStrsMML = array('<mi>', '</mi>');
+ $arrDeleteToStrsMML = array('<mn>', '</mn>');
+ $mathML = str_replace($arrDeleteStrsMML, $arrDeleteToStrsMML, $mathML);
+
+ $rscXML = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $rscXML->loadXML($mathML);
++ libxml_disable_entity_loader($loadEntities);
+ $objXSLTProc = new XSLTProcessor();
+ $objXSL = new DOMDocument();
+ $objXSL->load('../xsl/MML2OMML_n.XSL');
+ $objXSLTProc->importStylesheet($objXSL);
+
+ $this->_mathML = $objXSLTProc->transformToXML($rscXML);
+ $arrOMML = array('<?xml version="1.0" encoding="UTF-8"?>',
+ ' xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/'
+ . 'math" xmlns:mml="http://www.w3.org/1998/Math/MathML"');
+ $arrToOMML = array('', '');
+ $this->_mathML = str_replace($arrOMML, $arrToOMML, $this->_mathML);
+ }
+
+}
diff --cc 3rdparty/phpdocx/classes/Docx2Text.inc
index 1e246f2,0000000..0cc2262
mode 100644,000000..100644
--- a/3rdparty/phpdocx/classes/Docx2Text.inc
+++ b/3rdparty/phpdocx/classes/Docx2Text.inc
@@@ -1,656 -1,0 +1,661 @@@
+<?php
+
+/**
+ * Docx 2 text
+ *
+ * @category Phpdocx
+ * @package transform
+ * @copyright Copyright (c) Narcea Producciones Multimedia S.L.
+ * (http://www.2mdc.com)
+ * @license LGPL
+ * @version 3.0
+ * @link http://www.phpdocx.com
+ * @since File available since Release 3.0
+ */
+class Docx2Text
+{
+ const SEPARATOR_WINDOWS = PHP_EOL;
+ const SEPARATOR_LINUX = "\n";//eol
+ const SEPARATOR_TAB = "\t";
+ const DEBUG = 0;
+ const SEPARATOR_WINDOWS_DEBUG = '\n\r';//End of line chars
+ const SEPARATOR_LINUX_DEBUG = '\n';//constant
+ const SEPARATOR_TAB_DEBUG = '\t';
+
+ /**
+ * object zipArchive
+ * @var string
+ * @access private
+ */
+ private $docx;
+
+ /**
+ * object domDocument from document.xml
+ * @var string
+ * @access private
+ */
+ private $domDocument;
+
+ /**
+ * xml from document.xml
+ * @var string
+ * @access private
+ */
+ private $_document;
+
+ /**
+ * xml from numbering.xml
+ * @var string
+ * @access private
+ */
+ private $_numbering;
+
+ /**
+ * xml from footnote
+ * @var string
+ * @access private
+ */
+ private $_footnote;
+
+ /**
+ * xml from endnote
+ * @var string
+ * @access private
+ */
+ private $_endnote;
+
+ /**
+ * xml from word/_rels/document.rels.xml
+ * @var string
+ * @access private
+ */
+ private $_relations;
+
+ /**
+ * array of all the endnotes of the document
+ * @var string
+ * @access private
+ */
+ private $endnotes;
+
+ /**
+ * array of all the footnotes of the document
+ * @var string
+ * @access private
+ */
+ private $footnotes;
+
+ /**
+ * array of all the relations of the document
+ * @var string
+ * @access private
+ */
+ private $relations;
+
+ /**
+ * array of characters to insert like a list
+ * @var string
+ * @access private
+ */
+ private $numberingList;
+
+ /**
+ * the text content that will be exported
+ * @var string
+ * @access private
+ */
+ private $textOuput;
+
+
+ /**
+ * boolean variable to know if a chart will be transformed to text
+ * @var string
+ * @access private
+ */
+ private $chart2text;
+
+ /**
+ * boolean variable to know if a table will be transformed to text
+ * @var string
+ * @access private
+ */
+ private $table2text;
+
+ /**
+ * boolean variable to know if a list will be transformed to text
+ * @var string
+ * @access private
+ */
+ private $list2text;
+
+ /**
+ * boolean variable to know if a paragraph will be transformed to text
+ * @var string
+ * @access private
+ */
+ private $paragraph2text;
+
+ /**
+ * boolean variable to know if footnotes will be extracteded
+ * @var string
+ * @access private
+ */
+ private $footnote2text;
+
+ /**
+ * boolean variable to know if endnotes will be extracted
+ * @var string
+ * @access private
+ */
+ private $endnote2text;
+
+ /**
+ * Construct
+ * @param array of boolean values of which elements should be transformed or not
+ * @access public
+ */
+
+ public function __construct($boolTransforms = array())
+ {
+ //table,list, paragraph, footnote, endnote, chart
+ if (isset($boolTransforms['table'])) {
+ $this->table2text = $boolTransforms['table'];
+ } else {
+ $this->table2text = true;
+ }
+
+ if (isset($boolTransforms['list'])) {
+ $this->list2text = $boolTransforms['list'];
+ } else {
+ $this->list2text = true;
+ }
+
+ if (isset($boolTransforms['paragraph'])) {
+ $this->paragraph2text = $boolTransforms['paragraph'];
+ } else {
+ $this->paragraph2text = true;
+ }
+
+ if (isset($boolTransforms['footnote'])) {
+ $this->footnote2text = $boolTransforms['footnote'];
+ } else {
+ $this->footnote2text = true;
+ }
+
+ if (isset($boolTransforms['endnote'])) {
+ $this->endnote2text = $boolTransforms['endnote'];
+ } else {
+ $this->endnote2text = true;
+ }
+
+ if (isset($boolTransforms['chart'])) {
+ $this->chart2text = $boolTransforms['chart'];
+ } else {
+ $this->chart2text = true;
+ }
+
+ $this->textOuput = '';
+ $this->docx = null;
+ $this->_numbering = '';
+ $this->numberingList= array();
+ $this->endnotes = array();
+ $this->footnotes = array();
+ $this->relations = array();
+
+ }
+
+ /**
+ *
+ * Extract the content of a word document and create a text file if the name is given
+ *
+ * @access public
+ * @param string $filename of the word document.
+ *
+ */
+
+ public function extract($filename = '')
+ {
+ if (empty($this->_document)) {
+ //xml content from document.xml is not got
+ CreateDocx::$log->fatal('There is no content from document.xml');
+ exit();
+ }
+
+ $this->domDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $this->domDocument->loadXML($this->_document);
++ libxml_disable_entity_loader($loadEntities);
+ //get the body node to check the content from all his children
+ $bodyNode = $this->domDocument->getElementsByTagNameNS('http://schemas.openxmlformats.org/wordprocessingml/2006/main', 'body');
+ //We get the body node. it is known that there is only one body tag
+ $bodyNode = $bodyNode->item(0);
+ foreach($bodyNode->childNodes as $child){
+ //the children can be a table, a paragraph or a section. We only implement the 2 first option said.
+ if ($this->table2text && $child->tagName == 'w:tbl') {
+ //this node is a table and the content is split with tabs if the variable table2text from the class is true
+ $this->textOuput .= $this->table($child) . $this->separator();
+ } else {
+ //this node is a paragraph
+ $this->textOuput .= $this->printWP($child) . ($this->paragraph2text ? $this->separator() : '');
+ }
+ }
+ if (!empty($filename)) {
+ $this->writeFile($filename, $this->textOuput);
+ } else {
+ echo $this->textOuput;
+ }
+ }
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getDocument()
+ {
+ return $this->_document;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setDocument($docu)
+ {
+ $this->_document = $docu;
+ }
+
+ /**
+ * Getter
+ *
+ * @access public
+ */
+ public function getDocx()
+ {
+ return $this->docx;
+ }
+
+ /**
+ * Setter
+ *
+ * @access public
+ */
+ public function setDocx($filename)
+ {
+ $this->docx = new ZipArchive();
+ $ret = $this->docx->open($filename);
+ if ($ret === true) {
+ $this->_document = $this->docx->getFromName('word/document.xml');
+ }
+ }
+
+ /**
+ * Write the file
+ *
+ * @access public
+ * @param the name of the file which is going to write
+ * @param the data of the file
+ */
+ public function writeFile($filename, $data)
+ {
+ if (!$handle = fopen($filename, 'w+')) {
+ CreateDocx::$log->fatal('Cannot open file ($filename)');
+ exit();
+ }
+ // Write $data to our opened file.
+ if (fwrite($handle, $data) === FALSE) {
+ CreateDocx::$log->fatal('Cannot write to file ($filename)');
+ exit();
+ }
+ fclose($handle);
+ }
+
+ /**
+ * extract the content to an array from endnote.xml
+ *
+ * @access private
+ */
+ private function loadEndNote()
+ {
+ if (empty($this->endnotes)) {
+ if (empty($this->_endnote)) {
+ $this->_endnote = $this->docx->getFromName('word/endnotes.xml');
+ }
+ if (!empty($this->_endnote)) {
+ $domDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $domDocument->loadXML($this->_endnote);
++ libxml_disable_entity_loader($loadEntities);
+ $endnotes = $domDocument->getElementsByTagNameNS('http://schemas.openxmlformats.org/wordprocessingml/2006/main', 'endnote');
+ foreach ($endnotes as $endnote) {
+ $xml = $endnote->ownerDocument->saveXML($endnote);
+ $this->endnotes[$endnote->getAttribute('w:id')] = trim(strip_tags($xml));
+ }
+ }
+ }
+ }
+
+ /**
+ * Extract the content to an array from footnote.xml
+ *
+ * @access private
+ */
+ private function loadFootNote()
+ {
+ if (empty($this->footnotes)) {
+ if (empty($this->_footnote)) {
+ $this->_footnote = $this->docx->getFromName('word/footnotes.xml');
+ }
+ if (!empty($this->_footnote)) {
+ $domDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $domDocument->loadXML($this->_footnote);
++ libxml_disable_entity_loader($loadEntities);
+ $footnotes = $domDocument->getElementsByTagNameNS('http://schemas.openxmlformats.org/wordprocessingml/2006/main', 'footnote');
+ foreach ($footnotes as $footnote) {
+ $xml = $footnote->ownerDocument->saveXML( $footnote );
+ $this->footnotes[$footnote->getAttribute('w:id')] = trim(strip_tags ($xml));
+ }
+ }
+ }
+ }
+
+ /**
+ * Extract the styles of the list to an array
+ *
+ * @access private
+ */
+ private function listNumbering()
+ {
+ $ids = array();
+ $nums = array();
+ //get the xml code from the zip archive
+ $this->_numbering = $this->docx->getFromName('word/numbering.xml');
+ if(!empty($this->_numbering)){
+ //we use the domdocument to iterate the children of the numbering tag
+ $domDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $domDocument->loadXML($this->_numbering);
++ libxml_disable_entity_loader($loadEntities);
+ $numberings = $domDocument->getElementsByTagNameNS('http://schemas.openxmlformats.org/wordprocessingml/2006/main', 'numbering');
+ //there is only one numbering tag in the numbering.xml
+ $numberings = $numberings->item(0);
+ foreach ($numberings->childNodes as $child) {
+ $flag = true;//boolean variable to know if the node is the first style of the list
+ foreach ($child->childNodes as $son) {
+ if ($child->tagName == 'w:abstractNum' && $son->tagName == 'w:lvl') {
+ foreach ($son->childNodes as $daughter) {
+ if ($daughter->tagName == 'w:numFmt' && $flag) {
+ $nums[$child->getAttribute('w:abstractNumId')] = $daughter->getAttribute('w:val');//set the key with internal index for the listand the value it is the type of bullet
+ $flag = false;
+ }
+ }
+ } elseif ($child->tagName == 'w:num' && $son->tagName == 'w:abstractNumId') {
+ $ids[$son->getAttribute('w:val')] = $child->getAttribute('w:numId');//$ids is the index of the list
+ }
+ }
+ }
+ //once we know what kind of list there is in the documents, is prepared the bullet that the library will use
+ foreach ($ids as $ind => $id) {
+ if ($nums[$ind] == 'decimal') {
+ //if the type is decimal it means that the bullet will be numbers
+ $this->numberingList[$id][0] = range(1, 10);
+ $this->numberingList[$id][1] = range(1, 10);
+ $this->numberingList[$id][2] = range(1, 10);
+ $this->numberingList[$id][3] = range(1, 10);
+ } else {
+ //otherwise is *, and other characters
+ $this->numberingList[$id][0] = array('*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*');
+ $this->numberingList[$id][1] = array(chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175),chr(175));
+ $this->numberingList[$id][2] = array(chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237),chr(237));
+ $this->numberingList[$id][3] = array(chr(248),chr(248),chr(248),chr(248),chr(248),chr(248),chr(248),chr(248),chr(248),chr(248),chr(248));
+ }
+ }
+ }
+ }
+
+ /**
+ * Extract the content of word/_rels/document._rels.xml
+ *
+ * @access private
+ */
+ private function loadRelations()
+ {
+ if (empty($this->relations)) {
+ if (empty($this->_relations)) {
+ $this->_relations = $this->docx->getFromName('word/_rels/document.xml.rels');
+ }
+ $domDocument = new DomDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $domDocument->loadXML($this->_relations);
++ libxml_disable_entity_loader($loadEntities);
+ $relations = $domDocument->getElementsByTagName('Relationships');
+ $relations = $relations->item(0);
+ foreach ($relations->childNodes as $relation) {
+ $this->relations[$relation->getAttribute('Id')]['file'] = $relation->getAttribute('Target');
+ $this->relations[$relation->getAttribute('Id')]['type'] = $relation->getAttribute('Type');
+ }
+ }
+ }
+
+ /**
+ * Print the data of the chart as formatted text
+ *
+ * @access private
+ * @param $chart
+ */
+ private function printChartDataArray($chart)
+ {
+ $ret = $this->separator();
+ $ret .= '[Chart => ' . $this->separator();
+ $ret .= "\t" . 'Type: ' . $chart->getType() . $this->separator();
+ $ret .= "\t" . 'Type Group: ' . $chart->getTypeGroup() . $this->separator();
+ $ret .= "\t" . 'Data: ' . $this->separator();
+ foreach ($chart->getData() as $key => $fila) {
+ $ret .= "\t\t" .'"' . $key . '" => ' . $this->separator();
+ foreach ($fila as $index => $value) {
+ $ret .= "\t\t\t" . '"' . $index . '" => ' . $value . $this->separator();
+ }
+ }
+ $ret .= "]" . $this->separator();
+ return $ret;
+ }
+
+ /**
+ * print the data of the chart as formatted text
+ *
+ * @access private
+ * @param $chart
+ */
+ private function printChartDataTable($chart)
+ {
+ $ret = $this->separator();
+ $ret .= '[Chart => ' . $this->separator();
+ $ret .= "\t" . 'Type: ' . $chart->getType() . $this->separator();
+ $ret .= "\t" . 'Type Group: ' . $chart->getTypeGroup() . $this->separator();
+ $ret .= "\t" . 'Data: ' . $this->separator();
+ $ret .= "\t\t";
+ foreach ($chart->getData() as $key => $fila) {
+ foreach ($fila as $index => $value) {
+ $ret .= "\t" .'"' . $index .'"';
+ }
+ break;
+ }
+ $ret .= $this->separator();
+ foreach ($chart->getData() as $key => $fila) {
+ $ret .= "\t\t\t" .'"' . $key .'"';
+ foreach ($fila as $index => $value) {
+ $ret .= "\t" . $value;
+ }
+ $ret .= $this->separator();
+ }
+ $ret .= "]" . $this->separator();
+ return $ret;
+ }
+
+ /**
+ * Extract the content of a w:p tag
+ *
+ * @access private
+ * @param $node is an object DOMNode
+ */
+ private function printWP($node)
+ {
+ $ilvl = $numId = -1;
+ if ($this->list2text) {//transform the list in ooxml to formatted list with tabs and bullets
+ if (empty($this->numberingList)) {//check if numbering.xml is extracted from the zip archive
+ $this->listNumbering();
+ }
+ //use the xpath to get expecific children from a node
+ $xpath = new DOMXPath($this->domDocument);
+ $query = 'w:pPr/w:numPr';
+ $xmlLists = $xpath->query($query, $node);
+ $xmlLists = $xmlLists->item(0);
+
+ if (isset($xmlLists) && $xmlLists->tagName == 'w:numPr') {
+ if ($xmlLists->hasChildNodes()) {
+ foreach ($xmlLists->childNodes as $child) {
+ if ($child->tagName == 'w:ilvl') {
+ $ilvl = $child->getAttribute('w:val');
+ }elseif ($child->tagName == 'w:numId') {
+ $numId = $child->getAttribute('w:val');
+ }
+ }
+ }
+ }
+ if (($ilvl != -1) && ($numId != -1)) {
+ //if is founded the style index of the list in the document and the kind of list
+ $ret = '';
+ for($i=-1; $i < $ilvl; $i++) {
+ if(self::DEBUG) {
+ $ret .= self::SEPARATOR_TAB_DEBUG;
+ }
+ else {
+ $ret .= self::SEPARATOR_TAB;
+ }
+ }
+ $ret .= array_shift($this->numberingList[$numId][$ilvl]) . ' ' . $this->toText($node); //print the bullet
+ } else {
+ $ret = $this->toText($node);
+ }
+ } else{
+ //if dont want to formatted lists, we strip from html tags
+ $ret = $this->toText($node);
+ }
+
+
+ //get the data from the charts
+ if ($this->chart2text) {
+ $query = 'w:r/w:drawing/wp:inline';
+ $xmlChart = $xpath->query($query, $node);
+ //get the relation id from the document, to get the name of the xml chart file from the relations to extract the xml code.
+ foreach ($xmlChart as $chart) {
+ foreach ($chart->childNodes as $child) {
+ foreach ($child->childNodes as $child2) {
+ foreach ($child2->childNodes as $child3) {
+ $rid = $child3->getAttribute('r:id');
+ }
+ }
+ }
+ }
+ if (!empty($rid)) {
+ if (empty($this->relations)) {
+ $this->loadRelations();
+ }
+ //get the name of the chart xml file from the relations docuemnt
+ $dataChart = new getDataFromXmlChart($this->docx->getFromName('word/' . $this->relations[$rid]['file']));
+ if (in_array($this->chart2text, array(2,'table'))) {
+ $ret .= $this->printChartDataTable($dataChart);//formatted print of the chart data
+ } else {
+ $ret .= $this->printChartDataArray($dataChart);//formatted print of the chart data
+ }
+ }
+ }
+ //extract the expecific endnote to insert with the text content
+ if ($this->endnote2text) {
+ if (empty($this->endnotes)) {
+ $this->loadEndNote();
+ }
+ $query = 'w:r/w:endnoteReference';
+ $xmlEndNote = $xpath->query($query, $node);
+ foreach ($xmlEndNote as $note) {
+ $ret .= '[' . $this->endnotes[$note->getAttribute('w:id')] . '] ';
+ }
+ }
+ //extract the expecific footnote to insert with the text content
+ if ($this->footnote2text) {
+ if (empty($this->footnotes)) {
+ $this->loadFootNote();
+ }
+ $query = 'w:r/w:footnoteReference';
+ $xmlFootNote = $xpath->query($query, $node);
+ foreach ($xmlFootNote as $note) {
+ $ret .= '[' . $this->footnotes[$note->getAttribute('w:id')] . '] ';
+ }
+ }
+ if((($ilvl != -1) && ($numId != -1)) || (1)) {
+ $ret .= $this->separator();
+ }
+
+ return $ret;
+ }
+
+ /**
+ * return a text end of line
+ *
+ * @access private
+ */
+ private function separator()
+ {
+ return "\r\n";
+ }
+
+ /**
+ *
+ * Extract the content of a table node from the document.xml and return a text content
+ *
+ * @access private
+ * @param $node is a object DOMNode
+ *
+ */
+ private function table($node)
+ {
+ $output = '';
+ if ($node->hasChildNodes()) {
+ foreach ($node->childNodes as $child) {
+ //start a new line of the table
+ if ($child->tagName == 'w:tr') {
+ foreach ($child->childNodes as $cell) {
+ //start a new cell
+ if ($cell->tagName == 'w:tc') {
+ if ($cell->hasChildNodes()) {
+ //
+ foreach ($cell->childNodes as $p) {
+ $output .= $this->printWP($p);
+ }
+ $output .= self::SEPARATOR_TAB;
+ }
+ }
+ }
+ }
+ $output .= $this->separator();
+ }
+ }
+ return $output;
+ }
+
+
+ /**
+ *
+ * Extract the content of a node from the document.xml and return only the text content and. stripping the html tags
+ *
+ * @access private
+ * @param $node is a object DOMNode
+ *
+ */
+ private function toText($node)
+ {
+ $xml = $node->ownerDocument->saveXML($node);
+ return trim(strip_tags ($xml));
+ }
+}
diff --cc 3rdparty/phpdocx/classes/TransformDoc.inc
index dd6e511,0000000..1dab62c
mode 100644,000000..100644
--- a/3rdparty/phpdocx/classes/TransformDoc.inc
+++ b/3rdparty/phpdocx/classes/TransformDoc.inc
@@@ -1,406 -1,0 +1,410 @@@
+<?php
+
+/**
+ * Transform DOCX to PDF or XHTML
+ *
+ * @category Phpdocx
+ * @package transform
+ * @copyright Copyright (c) Narcea Producciones Multimedia S.L.
+ * (http://www.2mdc.com)
+ * @license LGPL
+ * @version 3.0
+ * @link http://www.phpdocx.com
+ * @since File available since Release 3.0
+ */
+
+error_reporting(E_ALL & ~E_NOTICE);
+
+require_once dirname(__FILE__) . '/AutoLoader.inc';
+AutoLoader::load();
+
+class TransformDoc
+{
+ const SCHEMA_IMAGEDOCUMENT =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image';
+ const SCHEMA_OFFICEDOCUMENT =
+ 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
+
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_document;
+
+ /**
+ *
+ * @access private
+ * @var array
+ */
+ private $_docProps;
+
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_xhtml;
+
+ /**
+ * Construct
+ *
+ * @access public
+ */
+ public function __construct()
+ {
+
+ }
+
+ /**
+ * Destruct
+ *
+ * @access public
+ */
+ public function __destruct()
+ {
+
+ }
+
+ /**
+ * Getter. Document
+ *
+ * @access public
+ */
+ public function getDocument()
+ {
+ return $this->_document;
+ }
+
+ /**
+ * Getter. Document
+ *
+ * @access public
+ */
+ public function setDocument($document)
+ {
+ $this->_document = $document;
+ }
+
+ /**
+ * Getter. DocProps
+ *
+ * @access public
+ */
+ public function getDocProps()
+ {
+ return $this->_docProps;
+ }
+
+ /**
+ * Getter. DocProps
+ *
+ * @access public
+ */
+ public function setDocProps($props)
+ {
+ $this->_docProps = $props;
+ }
+
+ /**
+ * Getter. File
+ *
+ * @access public
+ */
+ public function getstrFile()
+ {
+ return $this->strFile;
+ }
+
+ /**
+ * Getter. XHTML
+ *
+ * @access public
+ */
+ public function getStrXHTML()
+ {
+ return $this->_xhtml;
+ }
+
+ /**
+ * Getter. Output file
+ *
+ * @access public
+ */
+ public function getStrOutputFile()
+ {
+ return $this->strOutputFile;
+ }
+
+ /**
+ * Setter. File
+ *
+ * @access public
+ */
+ public function setstrFile($file)
+ {
+ $this->strFile = $file;
+ }
+
+ /**
+ * Setter. XHTML
+ *
+ * @access public
+ */
+ public function setStrXHTML($strXHTML)
+ {
+ $this->_xhtml = $strXHTML;
+ }
+
+ /**
+ *
+ * @param string $outputFile
+ */
+ public function setStrOutputFile($outputFile)
+ {
+ $this->strOutputFile = $outputFile;
+ }
+
+ /**
+ * Return zip path
+ *
+ * @access public
+ * @return string
+ */
+ public function absoluteZipPath($path)
+ {
+ $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
+ $parts = array_filter(
+ explode(DIRECTORY_SEPARATOR, $path), 'strlen'
+ );
+ $arrAbsolutes = array();
+ foreach ($parts as $datParts) {
+ if ('.' == $datParts)
+ continue;
+ if ('..' == $datParts) {
+ array_pop($arrAbsolutes);
+ } else {
+ $arrAbsolutes[] = $datParts;
+ }
+ }
+ return implode('/', $arrAbsolutes);
+ }
+
+ /**
+ * Clean HTML
+ *
+ * @access public
+ */
+ public function cleanXHTML()
+ {
+ $sectionOne = explode('<head>', $this->_xhtml);
+ $sectionTwo = explode('</head>', $this->_xhtml);
+ $sectionTwo = str_replace(
+ 'src="?image="', 'src="imagen_not_found.jpg"', $sectionTwo
+ );
+ if (!isset($sectionTwo[1])) {
+ $sectionTwo[1] = $this->_xhtml;
+ $sectionOne[0] = '';
+ }
+ $this->_xhtml = $sectionOne[0] .
+ '<head><meta http-equiv="Content-Type" ' .
+ 'content="text/html; charset=utf-8" /></head>' . $sectionTwo[1];
+ }
+
+ /**
+ * Return file name
+ *
+ * @access public
+ */
+ public function getFileName()
+ {
+ try {
+ $partsFile = explode('/', $this->strFile);
+ $divideFile = explode('.', array_pop($partsFile));
+ $fileName = array_shift($divideFile);
+ }
+ catch (Exception $e) {
+ $fileName = 'file';
+ }
+ return $fileName;
+ }
+
+ /**
+ * Convert DOCX to XHTML
+ *
+ * @access public
+ */
+ public function generateXHTML()
+ {
+ $package = new ZipArchive();
+ if (!$package->open($this->strFile)) {
+ echo 'Unable to find the DOCX file';
+ exit();
+ }
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relations = simplexml_load_string(
+ $package->getFromName('_rels/.rels')
+ );
++ libxml_disable_entity_loader($loadEntities);
+
+ foreach ($relations->Relationship as $rel) {
+ if ($rel["Type"] == TransformDoc::SCHEMA_OFFICEDOCUMENT) {
+ $xml = $package->getFromName(
+ $this->absoluteZipPath(
+ dirname($rel['Target']) . '/' .
+ basename($rel['Target'])
+ )
+ );
+ $this->setDocument($xml);
+ $xmlDOM = new DOMDocument();
+ $xml = str_replace('</w:wordDocument>', '', $xml);
+ $xml = preg_replace(
+ '/(<w:wordDocument)+(.)*(><w:body>)/', '<w:body>', $xml
+ );
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ @$xmlDOM->loadXML($xml);
++ libxml_disable_entity_loader($loadEntities);
+ $xsl = new DOMDocument();
+ $xsl->load(dirname(__FILE__) . '/../xsl/docx2html.xsl');
+
+ $xsltProc = new XSLTProcessor();
+
+ $xsltProc->importStylesheet($xsl);
+ $this->_xhtml = $xsltProc->transformToXML($xmlDOM);
+ }
+ }
+
+ $pattern = "'src\s*=\s*([\"\'])?(?(1) (.*?)\\1 | ([^\s\>]+))'isx";
+ preg_match_all($pattern, $this->_xhtml, $domImgs);
+
+ $idImgs = array();
+ foreach ($domImgs[0] as $dats) {
+ $datsFiltered = explode('"', $dats);
+ if (preg_match('/^\?image=rId/', $datsFiltered[1])) {
+ $datFiltered = explode('?image=', $dats);
+ $idImgs[] = substr($datFiltered[1], 0, -1);
+ }
+ }
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $relationsImgs = simplexml_load_string(
+ $package->getFromName('word/_rels/document.xml.rels')
+ );
++ libxml_disable_entity_loader($loadEntities);
+ $pathImgs = array();
+ foreach ($relationsImgs->Relationship as $relImg) {
+ if ($relImg["Type"] == TransformDoc::SCHEMA_IMAGEDOCUMENT) {
+ $pathImgs[(string) $relImg["Id"]] =
+ (string) $relImg["Target"];
+ $pathZip[] = 'word/' . (string) $relImg["Target"];
+ }
+ }
+
+ foreach ($idImgs as $datsIdImgs) {
+ $this->_xhtml = str_replace(
+ "src=\"?image=$datsIdImgs\"",
+ "src=\"files/files_" .
+ "$this->strFile/media/word/$pathImgs[$datsIdImgs]\"",
+ $this->_xhtml
+ );
+ }
+
+ if (!empty($pathZip)) {
+ $package->extractTo(
+ "files/files_$this->strFile/media", $pathZip
+ );
+ $package->close();
+ }
+ }
+
+ /**
+ * Convert DOCX to PDF, using dompdf. DOCX->XHTML->PDF
+ *
+ * @access public
+ */
+ public function generatePDF($path = '')
+ {
+ $this->generateXHTML();
+ $this->cleanXHTML();
+ $this->_extractProps();
+ try {
+ $domPDF = new DOMPDF();
+ $domPDF->load_html($this->_xhtml);
+ $docProps = $this->getDocProps();
+ $domPDF->set_paper($docProps['size'], $docProps['orientation']);
+ $domPDF->render();
+ $fileName = $this->getFileName() . '.pdf';
+ if($path == ''){
+ $domPDF->stream($fileName);
+ }else{
+ file_put_contents($path, $domPDF->output());
+ }
+ }
+ catch (Exception $err) {
+ echo 'Unable to generate PDF file. ';
+ echo $err;
+ }
+ }
+
+ /**
+ * Validate HTML using tidy
+ *
+ * @access public
+ */
+ public function validatorXHTML()
+ {
+ ob_start();
+ echo $this->_xhtml;
+ $html = ob_get_clean();
+ $config = array(
+ 'indent' => true,
+ 'output-xhtml' => true,
+ 'wrap' => 200);
+ $tidy = new tidy();
+ $tidy->parseString($html, $config, 'utf8');
+ $tidy->cleanRepair();
+ $this->_xhtml = $tidy;
+ }
+
+ /**
+ * Get the document properties
+ *
+ * @return array
+ */
+ private function _extractProps()
+ {
+ $xmlDOM = new DOMDocument();
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $xmlDOM->loadXML($this->getDocument());
++ libxml_disable_entity_loader($loadEntities);
+ //Get the page size and orientation
+ $node = $xmlDOM->getElementsByTagName('pgSz');
+ $docProps = array();
+ $width = number_format(
+ $node->item(0)->getAttribute('w:w') / 20,
+ 2, '.', '');
+ $height = number_format(
+ $node->item(0)->getAttribute('w:h') / 20,
+ 2, '.', '');
+ $orient = $node->item(0)->getAttribute('w:orient');
+ if (empty($orient) || $orient == 'portrait') {
+ $docProps['orientation'] = 'portrait';
+ $docProps['size'] = array(0, 0, $width, $height);
+ } else {
+ $docProps['orientation'] = 'landscape';
+ $docProps['size'] = array(0, 0, $height, $width);
+ }
+
+ //Get the page margins
+ $node = $xmlDOM->getElementsByTagName('pgMar');
+ $margin = 'margin: ' .
+ floor($node->item(0)->getAttribute('w:top') / 15) . 'px ' .
+ floor($node->item(0)->getAttribute('w:right') / 15) . 'px ' .
+ floor($node->item(0)->getAttribute('w:bottom') / 15) . 'px ' .
+ floor($node->item(0)->getAttribute('w:left') / 15) . 'px;';
+ $xml = str_replace('$MARGIN$', $margin, $this->getStrXHTML());
+ $this->setStrXHTML($xml);
+
+ $this->setDocProps($docProps);
+ }
+
+}
diff --cc 3rdparty/phpdocx/classes/WordML.inc
index 5ab6527,0000000..be8686b
mode 100644,000000..100644
--- a/3rdparty/phpdocx/classes/WordML.inc
+++ b/3rdparty/phpdocx/classes/WordML.inc
@@@ -1,115 -1,0 +1,116 @@@
+<?php
+
+/**
+ * WordML
+ *
+ * @category Phpdocx
+ * @package elements
+ * @copyright Copyright (c) Narcea Producciones Multimedia S.L.
+ * (http://www.2mdc.com)
+ * @license LGPL
+ * @version 3.0
+ * @link http://www.phpdocx.com
+ * @since File available since Release 3.0
+ */
+include_once dirname(__FILE__) . '/CreateElement.inc';
+
+class WordML extends CreateElement
+{
+
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private $_wordML;
+ /**
+ *
+ * @access private
+ * @var string
+ */
+ private static $_instance = NULL;
+
+ /**
+ *
+ * @access public
+ * @static
+ * @var Logger
+ */
+ public static $log;
+
+
+ /**
+ * Construct
+ *
+ * @access public
+ */
+ public function __construct()
+ {
+ $this->_debug = Debug::getInstance();
+ Logger::configure(dirname(__FILE__) . '/conf/log4php.properties');
+ self::$log = Logger::getLogger('phpdocx_logger');
+ }
+
+ /**
+ * Destruct
+ *
+ * @access public
+ */
+ public function __destruct()
+ {
+
+ }
+
+ /**
+ * Magic method, returns current XML
+ *
+ * @access public
+ * @return string Return current XML
+ */
+ public function __toString()
+ {
+ return $this->_wordML;
+ }
+
+
+ /**
+ * Create raw WordML
+ *
+ * @access public
+ * @param string $data
+ */
+ public function createRawWordML($data)
+ {
+ $this->_wordML = (string) $data;
+ }
+
+ /**
+ * returns only the runs of content for embedding
+ *
+ * @access public
+ * @param string $data
+ */
+ public function inlineWordML()
+ {
+ $wordMLChunk = new DOMDocument();
+ $namespaces = 'xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.open [...]
+ $wordML = '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><w:root '.$namespaces.'>'.$this->_wordML;
+ $wordML = $wordML.'</w:root>';
- libxml_disable_entity_loader(true);
++ $loadEntities = libxml_disable_entity_loader(true);
+ $wordMLChunk->loadXML($wordML);
++ libxml_disable_entity_loader($loadEntities);
+ $wordMLXpath = new DOMXPath($wordMLChunk);
+ $wordMLXpath->registerNamespace('w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+ $query= '//w:r';
+ $wrNodes = $wordMLXpath->query($query);
+ $blockCleaned = '';
+ foreach ($wrNodes as $node){
+ $nodeR = $node->ownerDocument->saveXML($node);
+ $blockCleaned .= $nodeR;
+ }
+
+ return $blockCleaned;
+ }
+
+
+}
diff --cc apps/contacts/appinfo/app.php
index 363ebd6,0000000..ebbd024
mode 100644,000000..100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@@ -1,60 -1,0 +1,62 @@@
+<?php
+
+namespace OCA\Contacts;
+use \OC\AppFramework\Core\API;
+
+//require_once __DIR__ . '/../lib/controller/pagecontroller.php';
+\Sabre\VObject\Component::$classMap['VCARD'] = '\OCA\Contacts\VObject\VCard';
+\Sabre\VObject\Property::$classMap['CATEGORIES'] = 'OCA\Contacts\VObject\GroupProperty';
+\Sabre\VObject\Property::$classMap['FN'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['TITLE'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['ROLE'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['NOTE'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['NICKNAME'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['EMAIL'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['TEL'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['IMPP'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['URL'] = '\OC\VObject\StringProperty';
++\Sabre\VObject\Property::$classMap['LABEL'] = '\OC\VObject\StringProperty';
++\Sabre\VObject\Property::$classMap['X-EVOLUTION-FILE-AS'] = '\OC\VObject\StringProperty';
+\Sabre\VObject\Property::$classMap['N'] = '\OC\VObject\CompoundProperty';
+\Sabre\VObject\Property::$classMap['ADR'] = '\OC\VObject\CompoundProperty';
+\Sabre\VObject\Property::$classMap['GEO'] = '\OC\VObject\CompoundProperty';
+\Sabre\VObject\Property::$classMap['ORG'] = '\OC\VObject\CompoundProperty';
+
+\OC::$server->getNavigationManager()->add(array(
+ 'id' => 'contacts',
+ 'order' => 10,
+ 'href' => \OCP\Util::linkToRoute('contacts_index'),
+ 'icon' => \OCP\Util::imagePath( 'contacts', 'contacts.svg' ),
+ 'name' => \OCP\Util::getL10N('contacts')->t('Contacts')
+ )
+);
+
+$api = new API('contacts');
+
+$api->connectHook('OC_User', 'post_createUser', '\OCA\Contacts\Hooks', 'userCreated');
+$api->connectHook('OC_User', 'post_deleteUser', '\OCA\Contacts\Hooks', 'userDeleted');
+$api->connectHook('OCA\Contacts', 'pre_deleteAddressBook', '\OCA\Contacts\Hooks', 'addressBookDeletion');
+$api->connectHook('OCA\Contacts', 'pre_deleteContact', '\OCA\Contacts\Hooks', 'contactDeletion');
+$api->connectHook('OCA\Contacts', 'post_createContact', 'OCA\Contacts\Hooks', 'contactAdded');
+$api->connectHook('OCA\Contacts', 'post_updateContact', '\OCA\Contacts\Hooks', 'contactUpdated');
+$api->connectHook('OCA\Contacts', 'scanCategories', '\OCA\Contacts\Hooks', 'scanCategories');
+$api->connectHook('OCA\Contacts', 'indexProperties', '\OCA\Contacts\Hooks', 'indexProperties');
+$api->connectHook('OC_Calendar', 'getEvents', 'OCA\Contacts\Hooks', 'getBirthdayEvents');
+$api->connectHook('OC_Calendar', 'getSources', 'OCA\Contacts\Hooks', 'getCalenderSources');
+
+\OCP\Util::addscript('contacts', 'loader');
+
+\OC_Search::registerProvider('OCA\Contacts\SearchProvider');
+//\OCP\Share::registerBackend('contact', 'OCA\Contacts\Share_Backend_Contact');
+\OCP\Share::registerBackend('addressbook', 'OCA\Contacts\Share\Addressbook', 'contact');
+//\OCP\App::registerPersonal('contacts','personalsettings');
+
+if(\OCP\User::isLoggedIn()) {
+ $app = new App($api->getUserId());
+ $addressBooks = $app->getAddressBooksForUser();
+ foreach($addressBooks as $addressBook) {
- //if($addressBook->getBackend()->name === 'local') {
++ if($addressBook->isActive()) {
+ \OCP\Contacts::registerAddressBook(new AddressbookProvider($addressBook));
- //}
++ }
+ }
+}
diff --cc apps/contacts/lib/addressbookprovider.php
index b38afa0,0000000..4f18644
mode 100644,000000..100644
--- a/apps/contacts/lib/addressbookprovider.php
+++ b/apps/contacts/lib/addressbookprovider.php
@@@ -1,275 -1,0 +1,275 @@@
+<?php
+/**
+ * ownCloud - AddressbookProvider
+ *
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus (thomas at tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCA\Contacts;
+use OCA\Contacts\Utils\Properties;
+
+/**
+ * This class manages our addressbooks.
+ * TODO: Port this to use the new backend
+ */
+class AddressbookProvider implements \OCP\IAddressBook {
+
+ const CONTACT_TABLE = '*PREFIX*contacts_cards';
+ const PROPERTY_TABLE = '*PREFIX*contacts_cards_properties';
+
+ /**
+ * Addressbook id
+ * @var integer
+ */
+ public $id;
+
+ /**
+ * Addressbook info array
+ * @var AddressBook
+ */
+ public $addressBook;
+
+ /**
+ * Constructor
+ * @param integer $id
+ */
+ public function __construct($addressBook) {
+ $this->addressBook = $addressBook;
+ }
+
+ public function getAddressbook() {
+ return $this->addressBook;
+ }
+
+ /**
+ * @return string defining the technical unique key
+ */
+ public function getKey() {
+ $metaData = $this->addressBook->getMetaData();
+ return $metaData['backend'].':'.$metaData['id'];
+ }
+
+ /**
+ * In comparison to getKey() this function returns a human readable (maybe translated) name
+ * @return mixed
+ */
+ public function getDisplayName() {
+ return $this->addressBook->getDisplayName();
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getPermissions() {
+ return $this->addressBook->getPermissions();
+ }
+
+ private function getProperty(&$results, $row) {
+ if(!$row['name'] || !$row['value']) {
+ return false;
+ }
+
+ $value = null;
+
+ switch($row['name']) {
+ case 'PHOTO':
+ $value = 'VALUE=uri:' . \OCP\Util::linkToAbsolute('contacts', 'photo.php') . '?id=' . $row['contactid'];
+ break;
+ case 'N':
+ case 'ORG':
+ case 'ADR':
+ case 'GEO':
+ case 'CATEGORIES':
+ $property = \Sabre\VObject\Property::create($row['name'], $row['value']);
+ $value = $property->getParts();
+ break;
+ default:
+ $value = $value = strtr($row['value'], array('\,' => ',', '\;' => ';'));
+ break;
+ }
+
+ if(in_array($row['name'], Properties::$multi_properties)) {
+ if(!isset($results[$row['contactid']])) {
+ $results[$row['contactid']] = array('id' => $row['contactid'], $row['name'] => array($value));
+ } elseif(!isset($results[$row['contactid']][$row['name']])) {
+ $results[$row['contactid']][$row['name']] = array($value);
+ } else {
+ $results[$row['contactid']][$row['name']][] = $value;
+ }
+ } else {
+ if(!isset($results[$row['contactid']])) {
+ $results[$row['contactid']] = array('id' => $row['contactid'], $row['name'] => $value);
+ } elseif(!isset($results[$row['contactid']][$row['name']])) {
+ $results[$row['contactid']][$row['name']] = $value;
+ }
+ }
+ }
+
+ /**
+ * @param $pattern
+ * @param $searchProperties
+ * @param $options
+ * @return array|false
+ */
+ public function search($pattern, $searchProperties, $options) {
+ $ids = array();
+ $results = array();
+ $query = 'SELECT DISTINCT `contactid` FROM `' . self::PROPERTY_TABLE . '` WHERE (';
+ $params = array();
+ foreach($searchProperties as $property) {
+ $params[] = $property;
+ $params[] = '%' . $pattern . '%';
+ $query .= '(`name` = ? AND `value` LIKE ?) OR ';
+ }
+ $query = substr($query, 0, strlen($query) - 4);
+ $query .= ')';
+
+ $stmt = \OCP\DB::prepare($query);
+ $result = $stmt->execute($params);
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('contacts', __METHOD__ . 'DB error: ' . \OC_DB::getErrorMessage($result),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ while( $row = $result->fetchRow()) {
+ $ids[] = $row['contactid'];
+ }
+
+ if(count($ids) > 0) {
+ $query = 'SELECT `' . self::CONTACT_TABLE . '`.`addressbookid`, `' . self::PROPERTY_TABLE . '`.`contactid`, `'
+ . self::PROPERTY_TABLE . '`.`name`, `' . self::PROPERTY_TABLE . '`.`value` FROM `'
+ . self::PROPERTY_TABLE . '`,`' . self::CONTACT_TABLE . '` WHERE `'
+ . self::CONTACT_TABLE . '`.`addressbookid` = \'' . $this->addressBook->getId() . '\' AND `'
+ . self::PROPERTY_TABLE . '`.`contactid` = `' . self::CONTACT_TABLE . '`.`id` AND `'
+ . self::PROPERTY_TABLE . '`.`contactid` IN (' . join(',', array_fill(0, count($ids), '?')) . ')';
+
- \OCP\Util::writeLog('contacts', __METHOD__ . 'DB query: ' . $query, \OCP\Util::DEBUG);
++ //\OCP\Util::writeLog('contacts', __METHOD__ . 'DB query: ' . $query, \OCP\Util::DEBUG);
+ $stmt = \OCP\DB::prepare($query);
+ $result = $stmt->execute($ids);
+ }
+ while( $row = $result->fetchRow()) {
+ $this->getProperty($results, $row);
+ }
+
+ return $results;
+ }
+
+ /**
+ * @param $properties
+ * @return mixed
+ */
+ public function createOrUpdate($properties) {
+ $id = null;
+ $vcard = null;
+ if(array_key_exists('id', $properties)) {
+ // TODO: test if $id belongs to this addressbook
+ $id = $properties['id'];
+ // TODO: Test $vcard
+ $vcard = App::getContactVCard($properties['id']);
+ foreach(array_keys($properties) as $name) {
+ if(isset($vcard->{$name})) {
+ unset($vcard->{$name});
+ }
+ }
+ } else {
+ $vcard = \Sabre\VObject\Component::create('VCARD');
+ $uid = substr(md5(rand().time()), 0, 10);
+ $vcard->add('UID', $uid);
+ try {
+ $id = VCard::add($this->id, $vcard, null, true);
+ } catch(Exception $e) {
+ \OCP\Util::writeLog('contacts', __METHOD__ . ' ' . $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+ }
+
+ foreach($properties as $name => $value) {
+ switch($name) {
+ case 'ADR':
+ case 'N':
+ if(is_array($value)) {
+ $property = \Sabre\VObject\Property::create($name);
+ $property->setParts($value);
+ $vcard->add($property);
+ } else {
+ $vcard->{$name} = $value;
+ }
+ break;
+ case 'BDAY':
+ // TODO: try/catch
+ $date = New \DateTime($value);
+ $vcard->BDAY = $date->format('Y-m-d');
+ $vcard->BDAY->VALUE = 'DATE';
+ break;
+ case 'EMAIL':
+ case 'TEL':
+ case 'IMPP': // NOTE: We don't know if it's GTalk, Jabber etc. only the protocol
+ case 'URL':
+ if(is_array($value)) {
+ foreach($value as $val) {
+ $vcard->add($name, strip_tags($val));
+ }
+ } else {
+ $vcard->add($name, strip_tags($value));
+ }
+ default:
+ $vcard->{$name} = $value;
+ break;
+ }
+ }
+
+ try {
+ VCard::edit($id, $vcard);
+ } catch(Exception $e) {
+ \OCP\Util::writeLog('contacts', __METHOD__ . ' ' . $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+
+ $asarray = VCard::structureContact($vcard);
+ $asarray['id'] = $id;
+ return $asarray;
+ }
+
+ /**
+ * @param $id
+ * @return mixed
+ */
+ public function delete($id) {
+ try {
+ $query = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `id` = ? AND `addressbookid` = ?';
+ $stmt = \OCP\DB::prepare($query);
+ $result = $stmt->execute(array($id, $this->id));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('contacts', __METHOD__ . 'DB error: ' . \OC_DB::getErrorMessage($result),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ if($result->numRows() === 0) {
+ \OCP\Util::writeLog('contacts', __METHOD__
+ . 'Contact with id ' . $id . 'doesn\'t belong to addressbook with id ' . $this->id,
+ \OCP\Util::ERROR);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('contacts', __METHOD__ . ', exception: ' . $e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ return VCard::delete($id);
+ }
+}
diff --cc apps/contacts/lib/controller/contactphotocontroller.php
index 8553ec4,0000000..f98270d
mode 100644,000000..100644
--- a/apps/contacts/lib/controller/contactphotocontroller.php
+++ b/apps/contacts/lib/controller/contactphotocontroller.php
@@@ -1,359 -1,0 +1,359 @@@
+<?php
+/**
+ * @author Thomas Tanghus
+ * Copyright (c) 2013 Thomas Tanghus (thomas at tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Contacts\Controller;
+
+use OCA\Contacts\App,
+ OCA\Contacts\JSONResponse,
+ OCA\Contacts\ImageResponse,
+ OCA\Contacts\Utils\Properties,
+ OCA\Contacts\Controller;
+
+/**
+ * Controller class For Contacts
+ */
+class ContactPhotoController extends Controller {
+
+ /**
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function getPhoto($maxSize = 170) {
+ // TODO: Cache resized photo
+ $params = $this->request->urlParams;
+ $etag = null;
- //$maxSize = isset($this->request['maxSize']) ? $this->request['maxSize'] : 170;
+
+ \OCP\Util::writeLog('contacts',
+ __METHOD__.' backend: '.$params['backend'].', ab; '.$params['addressBookId'].', contact: '.$params['contactId'],
+ \OCP\Util::DEBUG
+ );
+ $addressBook = $this->app->getAddressBook($params['backend'], $params['addressBookId']);
+ $contact = $addressBook->getChild($params['contactId']);
+
+ if(!$contact) {
+ $response = new JSONResponse();
+ $response->bailOut(App::$l10n->t('Couldn\'t find contact.'));
+ return $response;
+ }
+
+ $image = new \OCP\Image();
+ if (isset($contact->PHOTO) && $image->loadFromBase64((string)$contact->PHOTO)) {
+ // OK
+ $etag = md5($contact->PHOTO);
+ }
+ else
+ // Logo :-/
+ if(isset($contact->LOGO) && $image->loadFromBase64((string)$contact->LOGO)) {
+ // OK
+ $etag = md5($contact->LOGO);
+ }
+ if($image->valid()) {
+ $response = new ImageResponse($image);
+ $lastModified = $contact->lastModified();
+ // Force refresh if modified within the last minute.
+ if(!is_null($lastModified)) {
+ $response->setLastModified(\DateTime::createFromFormat('U', $lastModified) ?: null);
+ }
+ if(!is_null($etag)) {
+ $response->setETag($etag);
+ }
+ if ($image->width() > $maxSize || $image->height() > $maxSize) {
+ $image->resize($maxSize);
+ }
+ return $response;
+ } else {
+ $response = new JSONResponse();
+ $response->bailOut(App::$l10n->t('Error getting user photo'));
+ return $response;
+ }
+ }
+
+ /**
+ * Uploads a photo and saves in oC cache
+ * @return JSONResponse with data.tmp set to the key in the cache.
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function uploadPhoto() {
+ $params = $this->request->urlParams;
++ $maxSize = isset($this->request->post['maxSize']) ? $this->request->post['maxSize'] : 400;
+
+ $response = new JSONResponse();
+
+ if (!isset($this->request->files['imagefile'])) {
+ $response->bailOut(App::$l10n->t('No file was uploaded. Unknown error'));
+ return $response;
+ }
+
+ $file = $this->request->files['imagefile'];
+ $error = $file['error'];
+ if($error !== UPLOAD_ERR_OK) {
+ $errors = array(
+ 0=>App::$l10n->t("There is no error, the file uploaded with success"),
+ 1=>App::$l10n->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+ 2=>App::$l10n->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+ 3=>App::$l10n->t("The uploaded file was only partially uploaded"),
+ 4=>App::$l10n->t("No file was uploaded"),
+ 6=>App::$l10n->t("Missing a temporary folder")
+ );
+ $response->bailOut($errors[$error]);
+ return $response;
+ }
+
+ if(!file_exists($file['tmp_name'])) {
+ $response->bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
+ return $response;
+ }
+
+ $tmpkey = 'contact-photo-'.md5(basename($file['tmp_name']));
+ $image = new \OCP\Image();
+
+ if(!$image->loadFromFile($file['tmp_name'])) {
+ $response->bailOut(App::$l10n->t('Couldn\'t load temporary image: ').$file['tmp_name']);
+ return $response;
+ }
+
+ if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+ $response->debug('Couldn\'t save correct image orientation: '.$tmpkey);
+ }
+
++ if($image->valid()) {
++ if($image->height() > $maxSize || $image->width() > $maxSize) {
++ $image->resize($maxSize);
++ }
++ } else {
++ $response->bailOut(App::$l10n->t('Uploaded image is invalid'));
++ }
++
+ if(!$this->server->getCache()->set($tmpkey, $image->data(), 600)) {
+ $response->bailOut(App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
+ return $response;
+ }
+
+ $response->setData(array(
+ 'status' => 'success',
+ 'data' => array(
+ 'tmp'=>$tmpkey,
+ 'metadata' => array(
+ 'contactId'=> $params['contactId'],
+ 'addressBookId'=> $params['addressBookId'],
+ 'backend'=> $params['backend'],
+ ),
+ )
+ ));
+
+ return $response;
+ }
+
+ /**
+ * Saves the photo from the contact being edited to oC cache
+ * @return JSONResponse with data.tmp set to the key in the cache.
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function cacheCurrentPhoto() {
+ $params = $this->request->urlParams;
+ $response = new JSONResponse();
- $photoResponse = $this->getPhoto($maxSize = 400);
++ $maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
++
++ $photoResponse = $this->getPhoto($maxSize);
+
+ if(!$photoResponse instanceof ImageResponse) {
+ return $photoResponse;
+ }
+
+ $data = $photoResponse->render();
+ $tmpkey = 'contact-photo-' . $params['contactId'];
+ if(!$this->server->getCache()->set($tmpkey, $data, 600)) {
+ $response->bailOut(App::$l10n->t('Couldn\'t save temporary image: ').$tmpkey);
+ return $response;
+ }
+
+ $response->setParams(array(
+ 'tmp'=>$tmpkey,
+ 'metadata' => array(
+ 'contactId'=> $params['contactId'],
+ 'addressBookId'=> $params['addressBookId'],
+ 'backend'=> $params['backend'],
+ ),
+ ));
+
+ return $response;
+
+ }
+
+ /**
+ * Saves the photo from ownCloud FS to oC cache
+ * @return JSONResponse with data.tmp set to the key in the cache.
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function cacheFileSystemPhoto() {
+ $params = $this->request->urlParams;
++ $maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
+ $response = new JSONResponse();
+
+ if(!isset($this->request->get['path'])) {
+ $response->bailOut(App::$l10n->t('No photo path was submitted.'));
+ }
+
+ $localpath = \OC\Files\Filesystem::getLocalFile($this->request->get['path']);
+ $tmpkey = 'contact-photo-' . $params['contactId'];
+
+ if(!file_exists($localpath)) {
+ return $response->bailOut(App::$l10n->t('File doesn\'t exist:').$localpath);
+ }
+
+ $image = new \OCP\Image();
+ if(!$image) {
+ return $response->bailOut(App::$l10n->t('Error loading image.'));
+ }
+ if(!$image->loadFromFile($localpath)) {
+ return $response->bailOut(App::$l10n->t('Error loading image.'));
+ }
- if($image->width() > 400 || $image->height() > 400) {
- $image->resize(400); // Prettier resizing than with browser and saves bandwidth.
++ if($image->width() > $maxSize || $image->height() > $maxSize) {
++ $image->resize($maxSize); // Prettier resizing than with browser and saves bandwidth.
+ }
+ if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
+ $response->debug('Couldn\'t save correct image orientation: '.$localpath);
+ }
+ if(!$this->server->getCache()->set($tmpkey, $image->data(), 600)) {
+ return $response->bailOut('Couldn\'t save temporary image: '.$tmpkey);
+ }
+
+ return $response->setData(array(
+ 'tmp'=>$tmpkey,
+ 'metadata' => array(
+ 'contactId'=> $params['contactId'],
+ 'addressBookId'=> $params['addressBookId'],
+ 'backend'=> $params['backend'],
+ ),
+ ));
+
+ }
+
+ /**
+ * Get a photo from the oC cache for cropping.
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function getTempPhoto() {
+ $params = $this->request->urlParams;
+ $tmpkey = $params['key'];
- $maxSize = isset($this->request->get['maxSize']) ? $this->request->get['maxSize'] : 400;
+
+ $image = new \OCP\Image();
+ $image->loadFromData($this->server->getCache()->get($tmpkey));
+ if($image->valid()) {
- if($image->height() > $maxSize || $image->width() > $maxSize) {
- $image->resize($maxSize);
- }
+ $response = new ImageResponse($image);
+ return $response;
+ } else {
+ $response = new JSONResponse();
+ return $response->bailOut('Error getting temporary photo');
+ }
+ }
+
+ /**
+ * Get a photo from the oC and crops it with the suplied geometry.
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function cropPhoto() {
+ $params = $this->request->urlParams;
+ $x = (isset($this->request->post['x']) && $this->request->post['x']) ? $this->request->post['x'] : 0;
+ $y = (isset($this->request->post['y']) && $this->request->post['y']) ? $this->request->post['y'] : 0;
+ $w = (isset($this->request->post['w']) && $this->request->post['w']) ? $this->request->post['w'] : -1;
+ $h = (isset($this->request->post['h']) && $this->request->post['h']) ? $this->request->post['h'] : -1;
+ $tmpkey = $params['key'];
- $maxSize = isset($this->request->post['maxSize']) ? $this->request->post['maxSize'] : 200;
+
+ $app = new App($this->api->getUserId());
+ $addressBook = $app->getAddressBook($params['backend'], $params['addressBookId']);
+ $contact = $addressBook->getChild($params['contactId']);
+
+ $response = new JSONResponse();
+
+ if(!$contact) {
+ return $response->bailOut(App::$l10n->t('Couldn\'t find contact.'));
+ }
+
+ $data = $this->server->getCache()->get($tmpkey);
+ if(!$data) {
+ return $response->bailOut(App::$l10n->t('Image has been removed from cache'));
+ }
+
+ $image = new \OCP\Image();
+
+ if(!$image->loadFromData($data)) {
+ return $response->bailOut(App::$l10n->t('Error creating temporary image'));
+ }
+
+ $w = ($w !== -1 ? $w : $image->width());
+ $h = ($h !== -1 ? $h : $image->height());
+
+ if(!$image->crop($x, $y, $w, $h)) {
+ return $response->bailOut(App::$l10n->t('Error cropping image'));
+ }
+
- if($image->width() < $maxSize || $image->height() < $maxSize) {
- if(!$image->resize(200)) {
- return $response->bailOut(App::$l10n->t('Error resizing image'));
- }
- }
-
+ // For vCard 3.0 the type must be e.g. JPEG or PNG
+ // For version 4.0 the full mimetype should be used.
+ // https://tools.ietf.org/html/rfc2426#section-3.1.4
+ if(strval($contact->VERSION) === '4.0') {
+ $type = $image->mimeType();
+ } else {
+ $type = explode('/', $image->mimeType());
+ $type = strtoupper(array_pop($type));
+ }
+ if(isset($contact->PHOTO)) {
+ $property = $contact->PHOTO;
+ if(!$property) {
+ $this->server->getCache()->remove($tmpkey);
+ return $response->bailOut(App::$l10n
+ ->t('Error getting PHOTO property.'));
+ }
+ $property->setValue(strval($image));
+ $property->parameters = array();
+ $property->parameters[]
+ = new \Sabre\VObject\Parameter('ENCODING', 'b');
+ $property->parameters[]
+ = new \Sabre\VObject\Parameter('TYPE', $image->mimeType());
+ $contact->PHOTO = $property;
+ } else {
+ $contact->add('PHOTO',
+ strval($image), array('ENCODING' => 'b',
+ 'TYPE' => $type));
+ // TODO: Fix this hack
+ $contact->setSaved(false);
+ }
+ if(!$contact->save()) {
+ return $response->bailOut(App::$l10n->t('Error saving contact.'));
+ }
+
+ $thumbnail = Properties::cacheThumbnail(
+ $params['backend'],
+ $params['addressBookId'],
+ $params['contactId'],
+ $image
+ );
+
+ $response->setData(array(
+ 'status' => 'success',
+ 'data' => array(
+ 'id' => $params['contactId'],
+ 'thumbnail' => $thumbnail,
+ )
+ ));
+
+ $this->server->getCache()->remove($tmpkey);
+
+ return $response;
+ }
+
+}
diff --cc apps/contacts/lib/searchprovider.php
index 6eb146d,0000000..cca2947
mode 100644,000000..100644
--- a/apps/contacts/lib/searchprovider.php
+++ b/apps/contacts/lib/searchprovider.php
@@@ -1,28 -1,0 +1,34 @@@
+<?php
+
+namespace OCA\Contacts;
+
+class SearchProvider extends \OC_Search_Provider{
+ function search($query) {
+ $unescape = function($value) {
+ return strtr($value, array('\,' => ',', '\;' => ';'));
+ };
+
+ $app = new App();
+ $searchresults = array( );
+ $results = \OCP\Contacts::search($query, array('N', 'FN', 'EMAIL', 'NICKNAME', 'ORG'));
+ $l = new \OC_l10n('contacts');
+ foreach($results as $result) {
+ $link = \OCP\Util::linkToRoute('contacts_index').'#' . $result['id'];
+ $props = array();
++ $display = (isset($result['FN']) && $result['FN']) ? $result['FN'] : null;
+ foreach(array('EMAIL', 'NICKNAME', 'ORG') as $searchvar) {
- if(isset($result[$searchvar]) && count($result[$searchvar]) > 0 && strlen($result[$searchvar][0]) > 3) {
- $props = array_merge($props, $result[$searchvar]);
++ if(isset($result[$searchvar]) && $result[$searchvar]) {
++ if(is_array($result[$searchvar])) {
++ $result[$searchvar] = array_filter($result[$searchvar]);
++ }
++ $prop = is_array($result[$searchvar]) ? implode(',', $result[$searchvar]) : $result[$searchvar];
++ $props[] = $prop;
++ $display = $display ?: $result[$searchvar];
+ }
+ }
+ $props = array_map($unescape, $props);
- $searchresults[]=new \OC_Search_Result($result['FN'], implode(', ', $props), $link, (string)$l->t('Contact'));//$name,$text,$link,$type
++ $searchresults[]=new \OC_Search_Result($display, implode(', ', $props), $link, (string)$l->t('Contact'), null);//$name,$text,$link,$type
+ }
+ return $searchresults;
+ }
+}
diff --cc apps/firstrunwizard/css/colorbox.css
index 1d2809b,0000000..cd34611
mode 100644,000000..100644
--- a/apps/firstrunwizard/css/colorbox.css
+++ b/apps/firstrunwizard/css/colorbox.css
@@@ -1,38 -1,0 +1,38 @@@
+/*
+ ColorBox Core Style:
+ The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:8;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/*
+ User Style:
+ Change the following styles to modify the appearance of ColorBox. They are
+ ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000;}
+#colorbox{}
+ #cboxContent{margin-top:20px;}
+ .cboxIframe{background:#fff;}
+ #cboxError{padding:50px; border:0px solid #ccc;}
+ #cboxLoadedContent{border:0px solid #555; background:#fff;border-radius: 5px;}
+ #cboxTitle{position:absolute; top:-20px; left:0; color:#ccc;}
+ #cboxCurrent{position:absolute; top:-20px; right:0px; color:#ccc;}
+ #cboxSlideshow{position:absolute; top:-20px; right:90px; color:#fff;}
- #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top left; width:28px; height:65px; text-indent:-9999px;}
++ #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:none; width:28px; height:65px; text-indent:-9999px;}
+ #cboxPrevious:hover{background-position:bottom left;}
- #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top right; width:28px; height:65px; text-indent:-9999px;}
++ #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:none; width:28px; height:65px; text-indent:-9999px;}
+ #cboxNext:hover{background-position:bottom right;}
+ #cboxLoadingOverlay{background:#fff;}
- #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
- #cboxClose{position:absolute; top:5px; right:5px; display:block; background:url(images/controls.png) no-repeat top center; width:38px; height:19px; text-indent:-9999px;}
++ #cboxLoadingGraphic{background:none;}
++ #cboxClose{position:absolute; top:5px; right:5px; display:block; background:none; width:38px; height:19px; text-indent:-9999px;}
+ #cboxClose:hover{background-position:bottom center;}
diff --cc apps/firstrunwizard/templates/wizard.php
index 00a800d,0000000..22d71bd
mode 100644,000000..100644
--- a/apps/firstrunwizard/templates/wizard.php
+++ b/apps/firstrunwizard/templates/wizard.php
@@@ -1,48 -1,0 +1,56 @@@
+<div id="firstrunwizard">
+
+<a id="closeWizard" class="close">
+ <img class="svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'actions/close.svg')); ?>">
+</a>
+
- <h1><?php p($l->t('Welcome to ownCloud'));?></h1>
++<h1><?php p($l->t('Welcome to'));?> <?php p($theme->getTitle()); ?></h1>
+<?php if (OC_Util::getEditionString() === ''): ?>
+<p><?php p($l->t('Your personal web services. All your files, contacts, calendar and more, in one place.'));?></p>
+<?php else: ?>
+<p><?php p($theme->getSlogan()); ?></p>
+<?php endif; ?>
+
+
+<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+<a target="_blank" href="<?php p($_['clients']['desktop']); ?>">
+ <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />
+</a>
+<a target="_blank" href="<?php p($_['clients']['android']); ?>">
+ <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>" />
+</a>
+<a target="_blank" href="<?php p($_['clients']['ios']); ?>">
+ <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
+</a>
+
- <h2><?php p($l->t('Connect your desktop apps to ownCloud'));?></h2>
+<?php if (OC_Util::getEditionString() === ''): ?>
++<h2><?php p($l->t('Connect your desktop apps to'));?> <?php p($theme->getName()); ?></h2>
+<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-calendars')) ?>">
+ <img class="appsmall appsmall-calendar svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'places/calendar-dark.svg')); ?>" /> <?php p($l->t('Connect your Calendar'));?>
+</a>
+<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-contacts')) ?>">
+ <img class="appsmall appsmall-contacts svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'places/contacts-dark.svg')); ?>" /> <?php p($l->t('Connect your Contacts'));?>
+</a>
- <?php endif; ?>
+<a target="_blank" class="button" href="<?php p(link_to_docs('user-webdav')); ?>">
+ <img class="appsmall svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'places/folder.svg')); ?>" /> <?php p($l->t('Access files via WebDAV'));?>
+</a>
++<?php else: ?>
++<br><br><br>
++<a target="_blank" class="button" href="<?php p(link_to_docs('user-manual')); ?>">
++ <img class="appsmall svg" src="<?php print_unescaped(OCP\Util::imagePath('settings', 'help.svg')); ?>" /> <?php p($l->t('Documentation'));?>
++</a>
++<a target="_blank" class="button" href="<?php p(link_to_docs('user-webdav')); ?>">
++ <img class="appsmall svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'places/folder.svg')); ?>" /> <?php p($l->t('Access files via WebDAV'));?>
++</a>
++<?php endif; ?>
+
+<p class="footnote">
+<?php if (OC_Util::getEditionString() === ''): ?>
+<?php print_unescaped($l->t('There’s more information in the <a target="_blank" href="%s">documentation</a> and on our <a target="_blank" href="http://owncloud.org">website</a>.', array(link_to_docs('user_manual')))); ?><br>
+<?php print_unescaped($l->t('If you like ownCloud, <a href="mailto:?subject=ownCloud&body=ownCloud is a great open software to sync and share your files. You can freely get it from http://owncloud.org">recommend it to your friends</a>!')); ?>
+<?php else: ?>
- © 2013 <a href="https://owncloud.com" target="_blank">ownCloud Inc.</a>
++© 2014 <a href="https://owncloud.com" target="_blank">ownCloud Inc.</a>
+<?php endif; ?>
+</p>
+
+</div>
diff --cc apps/updater/appinfo/app.php
index 6810da1,0000000..224a0e0
mode 100644,000000..100644
--- a/apps/updater/appinfo/app.php
+++ b/apps/updater/appinfo/app.php
@@@ -1,56 -1,0 +1,60 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2012-2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class App {
+
+ const APP_ID = 'updater';
+
+ public static $l10n;
+
+ public static function init() {
+ self::$l10n = \OCP\Util::getL10N(self::APP_ID);
+ \OC::$CLASSPATH['OCA\Updater\Backup'] = self::APP_ID . '/lib/backup.php';
+ \OC::$CLASSPATH['OCA\Updater\Downloader'] = self::APP_ID . '/lib/downloader.php';
+ \OC::$CLASSPATH['OCA\Updater\Updater'] = self::APP_ID . '/lib/updater.php';
+ \OC::$CLASSPATH['OCA\Updater\Helper'] = self::APP_ID . '/lib/helper.php';
+ \OC::$CLASSPATH['OCA\Updater\Location'] = self::APP_ID . '/lib/location.php';
+ \OC::$CLASSPATH['OCA\Updater\Location_3rdparty'] = self::APP_ID . '/lib/location/3rdparty.php';
+ \OC::$CLASSPATH['OCA\Updater\Location_Apps'] = self::APP_ID . '/lib/location/apps.php';
+ \OC::$CLASSPATH['OCA\Updater\Location_Core'] = self::APP_ID . '/lib/location/core.php';
+
+ //Allow config page
+ \OCP\App::registerAdmin(self::APP_ID, 'admin');
+ }
+
+ /**
+ * Get app working directory
+ * @return string
+ */
+ public static function getBackupBase() {
+ return \OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/updater_backup/';
+ }
+
+ public static function getLegacyBackupBase() {
+ return \OC::$SERVERROOT . '/backup/';
+ }
+
++ public static function getTempBase(){
++ return \OC::$SERVERROOT . "/_oc-upgrade/";
++ }
++
+ public static function log($message, $level= \OC_Log::ERROR) {
+ \OCP\Util::writeLog(self::APP_ID, $message, $level);
+ }
+}
+
+//Startup
+if (\OCP\App::isEnabled(App::APP_ID)) {
+ App::init();
+}
diff --cc apps/updater/lib/backup.php
index 3aea7d0,0000000..89ad146
mode 100644,000000..100644
--- a/apps/updater/lib/backup.php
+++ b/apps/updater/lib/backup.php
@@@ -1,74 -1,0 +1,75 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2012-2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class Backup {
+
+ /**
+ * Path to the current Backup instance
+ * @var string
+ */
+ protected static $path = '';
+
+ /**
+ * Perform backup
+ * @return string
+ */
+ public static function create() {
+ try {
+ $locations = Helper::getPreparedLocations();
+ Helper::mkdir(self::getPath(), true);
+ foreach ($locations as $type => $dirs) {
+ $backupFullPath = self::getPath() . '/' . $type . '/';
+ Helper::mkdir($backupFullPath, true);
+
+ foreach ($dirs as $name => $path) {
+ Helper::copyr($path, $backupFullPath . $name);
+ }
+ }
+ } catch (\Exception $e){
+ App::log('Backup creation failed. Check permissions.');
+ self::cleanUp();
+ throw $e;
+ }
+
+ return self::getPath();
+ }
+
+ /**
+ * Generate unique backup path
+ * or return existing one
+ * @return string
+ */
+ public static function getPath() {
+ if (!self::$path) {
+ $backupBase = App::getBackupBase();
+ $currentVersion = \OCP\Config::getSystemValue('version', '0.0.0');
+ $path = $backupBase . $currentVersion . '-';
+
+ do {
+ $salt = substr(md5(time()), 0, 8);
+ } while (file_exists($path . $salt));
+
+ self::$path = $path . $salt;
+ }
+ return self::$path;
+ }
+
+ public static function cleanUp(){
+ if (self::$path) {
+ Helper::removeIfExists(self::$path);
+ }
++ Helper::removeIfExists(App::getTempBase());
+ }
+
+}
diff --cc apps/updater/lib/downloader.php
index aab9baf,0000000..b3b0672
mode 100644,000000..100644
--- a/apps/updater/lib/downloader.php
+++ b/apps/updater/lib/downloader.php
@@@ -1,114 -1,0 +1,115 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2012-2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class Downloader {
+
+ const PACKAGE_ROOT = 'owncloud';
+
+ protected static $package = false;
+
+ public static function getPackage($url, $version) {
+ self::$package = \OCP\Files::tmpFile();
+ if (!self::$package){
+ throw new \Exception('Unable to create a temporary file');
+ }
+ try {
+
+ if (self::fetch($url)===false) {
+ throw new \Exception("Error storing package content");
+ }
+ if (preg_match('/\.zip$/i', $url)) {
+ rename(self::$package, self::$package . '.zip');
+ self::$package .= '.zip';
+ } elseif (preg_match('/(\.tgz|\.tar\.gz)$/i', $url)) {
+ rename(self::$package, self::$package . '.tgz');
+ self::$package .= '.tgz';
+ } elseif (preg_match('/\.tar\.bz2$/i', $url)) {
+ rename(self::$package, self::$package . '.tar.bz2');
+ self::$package .= '.tar.bz2';
+ } else {
+ throw new \Exception('Unable to extract package');
+ }
+
+ $extractDir = self::getPackageDir($version);
+ Helper::mkdir($extractDir, true);
+
+ $archive = \OC_Archive::open(self::$package);
+ if (!$archive || !$archive->extract($extractDir)) {
+ throw new \Exception(self::$package . " extraction error");
+ }
+
+ } catch (\Exception $e){
+ App::log('Retrieving ' . $url);
+ self::cleanUp($version);
+ throw $e;
+ }
+ Helper::removeIfExists(self::$package);
+
+ // Prepare extracted data
+ // to have '3rdparty', 'apps' and 'core' subdirectories
+ $sources = Helper::getSources($version);
+ $baseDir = $extractDir. '/' . self::PACKAGE_ROOT;
+ rename($baseDir . '/' . Helper::THIRDPARTY_DIRNAME, $sources[Helper::THIRDPARTY_DIRNAME]);
+ rename($baseDir . '/' . Helper::APP_DIRNAME, $sources[Helper::APP_DIRNAME]);
+ rename($baseDir, $sources[Helper::CORE_DIRNAME]);
+ }
+
+ /* To be replaced with OC_Util::getUrlContent for 5.x */
+ public static function fetch($url){
+
+ $urlFopen = ini_get('allow_url_fopen');
+ $allowed = array('on', 'yes', 'true', 1);
+
+ if (\in_array($urlFopen, $allowed)){
+ $result = @file_put_contents(self::$package, fopen($url, 'r'));
+ } elseif (function_exists('curl_init')) {
+ $curl = curl_init();
+ curl_setopt($curl, CURLOPT_HEADER, 0);
+ curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 0);
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_setopt($curl, CURLOPT_URL, $url);
+ curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
+
+ $result = @file_put_contents(self::$package, curl_exec($curl));
+
+ curl_close($curl);
+ } else {
+ $ctx = stream_context_create(
+ array(
+ 'http' => array('timeout' => 32000)
+ )
+ );
+
+ $result = @file_put_contents(self::$package, @file_get_contents($url, 0, $ctx));
+ }
+ return $result;
+ }
+
+ public static function cleanUp($version){
+ if (self::$package) {
+ Helper::removeIfExists(self::$package);
+ }
+ Helper::removeIfExists(self::getPackageDir($version));
++ Helper::removeIfExists(App::getTempBase());
+ }
+
+ public static function isClean($version){
+ return !@file_exists(self::getPackageDir($version));
+ }
+
+ public static function getPackageDir($version) {
- return App::getBackupBase() . $version;
++ return App::getTempBase() . $version;
+ }
+}
diff --cc apps/updater/lib/helper.php
index ae7a68d,0000000..029a56f
mode 100644,000000..100644
--- a/apps/updater/lib/helper.php
+++ b/apps/updater/lib/helper.php
@@@ -1,228 -1,0 +1,229 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2012-2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class Helper {
+ const APP_DIRNAME = 'apps';
+ const THIRDPARTY_DIRNAME = '3rdparty';
+ const CORE_DIRNAME = 'core';
+
+ /**
+ * Moves file/directory
+ * @param string $src - source path
+ * @param string $dest - destination path
+ * @throws \Exception on error
+ */
+ public static function move($src, $dest) {
+ if (!rename($src, $dest)) {
+ throw new \Exception("Unable to move $src to $dest");
+ }
+ }
+
+ /**
+ * Copy recoursive
+ * @param string $src - source path
+ * @param string $dest - destination path
+ * @throws \Exception on error
+ */
+ public static function copyr($src, $dest, $stopOnError = true) {
+ if(is_dir($src)) {
+ if(!is_dir($dest)) {
+ try {
+ self::mkdir($dest);
+ } catch (\Exception $e){
+ if ($stopOnError){
+ throw $e;
+ }
+ }
+ }
+ $files = scandir($src);
+ foreach ($files as $file) {
+ if ($file != "." && $file != "..") {
+ self::copyr("$src/$file", "$dest/$file", $stopOnError);
+ }
+ }
+ }elseif(file_exists($src)) {
+ if (!copy($src, $dest) && $stopOnError) {
+ throw new \Exception("Unable copy $src to $dest");
+ }
+ }
+ }
+
+ /**
+ * Wrapper for mkdir
+ * @param string $path
+ * @param bool $isRecoursive
+ * @throws \Exception on error
+ */
+ public static function mkdir($path, $isRecoursive = false) {
+ if (!mkdir($path, 0755, $isRecoursive)) {
+ throw new \Exception("Unable to create $path");
+ }
+ }
+
+ /**
+ * Get directory content as array
+ * @param string $path
+ * @return array
+ * @throws \Exception on error
+ */
+ public static function scandir($path) {
+ $content = scandir($path);
+ if (!is_array($content)) {
+ throw new \Exception("Unable to list $path content");
+ }
+ return $content;
+ }
+
+ /**
+ * Silently remove the filesystem item
+ * Used for cleanup
+ * @param string $path
+ */
+ public static function removeIfExists($path) {
+ if (!file_exists($path)) {
+ return;
+ }
+
+ if (is_dir($path)) {
+ self::rmdirr($path);
+ } else {
+ @unlink($path);
+ }
+ }
+
+ protected static function rmdirr($dir) {
+ if(is_dir($dir)) {
+ $files = scandir($dir);
+ foreach($files as $file) {
+ if ($file != "." && $file != "..") {
+ self::rmdirr("$dir/$file");
+ }
+ }
+ @rmdir($dir);
+ }elseif(file_exists($dir)) {
+ @unlink($dir);
+ }
+ if(file_exists($dir)) {
+ return false;
+ }else{
+ return true;
+ }
+ }
+
+ /**
+ * Get the final list of files/directories to be replaced
+ * e.g. ['core']['lib'] = '/path/to/lib'
+ * @return array
+ */
+ public static function getPreparedLocations() {
+ $preparedLocations = array();
+ foreach (self::getDirectories() as $type => $path) {
+ $preparedLocations[$type] = self::getFilteredContent($path);
+ }
+ return $preparedLocations;
+ }
+
+ /**
+ * Lists directory content as an array
+ * ['basename']=>'full path'
+ * e.g.['lib'] = '/path/to/lib'
+ * @param string $path
+ * @return array
+ */
+ public static function getFilteredContent($path){
+ $result = array();
+ $filtered = self::filterLocations(self::scandir($path), $path);
+ foreach ($filtered as $dirName){
+ $result [$dirName] = $path . '/' . $dirName;
+ }
+ return $result;
+ }
+
+ public static function filterLocations($locations, $basePath) {
+ $fullPath = array_values(self::getDirectories());
+ $fullPath[] = rtrim(App::getBackupBase(), '/');
++ $fullPath[] = rtrim(App::getTempBase(), '/');
+ $fullPath[] = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" );
+ $fullPath[] = \OC::$SERVERROOT."/themes";
+
+ foreach($fullPath as $key=>$path){
+ $fullPath[] = realpath($path);
+ }
+
+ $exclusions = array(
+ 'full' => $fullPath,
+ 'relative' => array('.', '..')
+ );
+
+ foreach ($locations as $key => $location) {
+ $fullPath = $basePath . '/' .$location;
+ $realPath = realpath($fullPath);
+ if (is_file($fullPath)) {
+ continue;
+ }
+ if (in_array($fullPath, $exclusions['full'])
+ || in_array($realPath, $exclusions['full'])
+ || in_array($location, $exclusions['relative'])
+ ) {
+ unset($locations[$key]);
+ }
+ }
+ return $locations;
+ }
+
+ /**
+ * Get the list of directories to be replaced on update
+ * @return array
+ */
+ public static function getDirectories() {
+ $dirs = array();
+ $dirs[self::THIRDPARTY_DIRNAME] = \OC::$THIRDPARTYROOT . '/' . self::THIRDPARTY_DIRNAME;
+
+ //Long, long ago we had single app location
+ if (isset(\OC::$APPSROOTS)) {
+ foreach (\OC::$APPSROOTS as $i => $approot){
+ $index = $i ? $i : '';
+ $dirs[self::APP_DIRNAME . $index] = $approot['path'];
+ }
+ } else {
+ $dirs[self::APP_DIRNAME] = \OC::$APPSROOT . '/' . self::APP_DIRNAME;
+ }
+
+ $dirs[self::CORE_DIRNAME] = \OC::$SERVERROOT;
+ return $dirs;
+ }
+
+ public static function getSources($version) {
+ $base = Downloader::getPackageDir($version);
+ return array (
+ self::APP_DIRNAME => $base . '/' . self::APP_DIRNAME,
+ self::THIRDPARTY_DIRNAME => $base . '/' . self::THIRDPARTY_DIRNAME,
+ self::CORE_DIRNAME => $base . '/' . self::CORE_DIRNAME,
+ );
+ }
+
+ public static function addDirectoryToZip($zip, $dir, $base) {
+ $newFolder = str_replace($base, '', $dir);
+ $zip->addEmptyDir($newFolder);
+ foreach(glob($dir . '/*') as $file) {
+ if(is_dir($file)) {
+ $zip = self::addDirectoryToZip($zip, $file, $base);
+ } else {
+ $newFile = str_replace($base, '', $file);
+ $zip->addFile($file, $newFile);
+ }
+ }
+ return $zip;
+ }
+}
diff --cc apps/updater/lib/location/core.php
index 10a4711,0000000..3c7af3b
mode 100644,000000..100644
--- a/apps/updater/lib/location/core.php
+++ b/apps/updater/lib/location/core.php
@@@ -1,80 -1,0 +1,81 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class Location_Core extends Location {
+
+ protected $type = 'core';
+
+ public function check() {
+ $errors = parent::check();
+ $specialCases = array(
+ $this->oldBase . '/' . 'config',
+ $this->oldBase . '/' . 'themes',
+ );
+
+ foreach ($specialCases as $item) {
+ if (!is_writable($item)) {
+ $errors[] = $item;
+ }
+ }
+
+ return $errors;
+ }
+
+ protected function filterOld($pathArray) {
+ $skip = array_values(Helper::getDirectories());
+ $skip[] = rtrim(App::getBackupBase(), '/');
+ $skip[] = \OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data");
++ $skip[] = rtrim(App::getTempBase(), '/');
+
+ // Skip 3rdparty | apps | backup | datadir | config | themes
+ foreach ($pathArray as $key => $path) {
+ if ($path === 'config' || $path === 'themes') {
+ unset($pathArray[$key]);
+ }
+ if (in_array($this->oldBase . '/' . $path, $skip)) {
+ unset($pathArray[$key]);
+ }
+ }
+ return $pathArray;
+ }
+
+ protected function filterNew($pathArray) {
+ // Skip config | themes
+ foreach ($pathArray as $key => $path) {
+ if ($path === 'config' || $path === 'themes') {
+ unset($pathArray[$key]);
+ }
+ }
+ return $pathArray;
+ }
+
+ protected function finalize() {
+ // overwrite config.sample.php
+ Helper::removeIfExists($this->oldBase . '/config/config.sample.php');
+ Helper::move($this->newBase . '/config/config.sample.php', $this->oldBase . '/config/config.sample.php');
+
+ // overwrite themes content with new files only
+ $themes = $this->toAbsolute(
+ $this->newBase . '/themes', Helper::scandir($this->newBase . '/themes')
+ );
+
+ foreach ($themes as $name => $location) {
+ Helper::removeIfExists($this->oldBase . '/themes/' . $name);
+ Helper::move($location, $this->oldBase . '/themes/' . $name);
+ }
+
+ parent::finalize();
+ }
+
+}
diff --cc apps/updater/lib/updater.php
index 33bfd7d,0000000..5b37625
mode 100644,000000..100644
--- a/apps/updater/lib/updater.php
+++ b/apps/updater/lib/updater.php
@@@ -1,95 -1,0 +1,96 @@@
+<?php
+
+/**
+ * ownCloud - Updater plugin
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2012-2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Updater;
+
+class Updater {
+
+ protected static $processed = array();
+
+ public static function update($version, $backupBase){
+ if (!is_dir($backupBase)){
+ throw new \Exception("Backup directory $backupBase is not found");
+ }
+
+ set_include_path(
+ $backupBase . PATH_SEPARATOR .
+ $backupBase . '/core/lib' . PATH_SEPARATOR .
+ $backupBase . '/core/config' . PATH_SEPARATOR .
+ $backupBase . '/3rdparty' . PATH_SEPARATOR .
+ $backupBase . '/apps' . PATH_SEPARATOR .
+ get_include_path()
+ );
+
+ $tempDir = self::getTempDir();
+ Helper::mkdir($tempDir, true);
+
+ $installed = Helper::getDirectories();
+ $sources = Helper::getSources($version);
+
+ try{
+ $thirdPartyUpdater = new Location_3rdparty(
+ $installed[Helper::THIRDPARTY_DIRNAME],
+ $sources[Helper::THIRDPARTY_DIRNAME]
+ );
+ $thirdPartyUpdater->update($tempDir . '/' . Helper::THIRDPARTY_DIRNAME);
+ self::$processed[] = $thirdPartyUpdater;
+
+ $coreUpdater = new Location_Core(
+ $installed[Helper::CORE_DIRNAME],
+ $sources[Helper::CORE_DIRNAME]
+ );
+ $coreUpdater->update($tempDir . '/' . Helper::CORE_DIRNAME);
+ self::$processed[] = $coreUpdater;
+
+ $appsUpdater = new Location_Apps(
+ '', //TODO: put smth really helpful here ;)
+ $sources[Helper::APP_DIRNAME]
+ );
+ $appsUpdater->update($tempDir . '/' . Helper::APP_DIRNAME);
+ self::$processed[] = $appsUpdater;
+ } catch (\Exception $e){
+ self::rollBack();
+ self::cleanUp();
+ throw $e;
+ }
+
+ // zip backup
+ $zip = new \ZipArchive();
+ if ($zip->open($backupBase . ".zip", \ZIPARCHIVE::CREATE) === true){
+ Helper::addDirectoryToZip($zip, $backupBase, $backupBase);
+ $zip->close();
+ \OCP\Files::rmdirr($backupBase);
+ }
+
+ return true;
+ }
+
+ public static function rollBack(){
+ foreach (self::$processed as $item){
+ $item->rollback();
+ }
+ }
+
+ public static function cleanUp(){
+ Helper::removeIfExists(self::getTempDir());
++ Helper::removeIfExists(App::getTempBase());
+ }
+
+ public static function isClean(){
+ return !@file_exists(self::getTempDir());
+ }
+
+ public static function getTempDir(){
- return App::getBackupBase() . 'tmp';
++ return App::getTempBase() . 'tmp';
+ }
+
+}
diff --cc core/doc/admin/_sources/apps/activity/Configuration.txt
index 8030fff,0000000..8030fff
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/Configuration.txt
+++ b/core/doc/admin/_sources/apps/activity/Configuration.txt
diff --cc core/doc/admin/_sources/apps/activity/Introduction.txt
index 990cf14,0000000..990cf14
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/Introduction.txt
+++ b/core/doc/admin/_sources/apps/activity/Introduction.txt
diff --cc core/doc/admin/_sources/apps/activity/RSS_Feed.txt
index f519a8f,0000000..f519a8f
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/RSS_Feed.txt
+++ b/core/doc/admin/_sources/apps/activity/RSS_Feed.txt
diff --cc core/doc/admin/_sources/apps/activity/Table_of_Contents.txt
index 7499137,0000000..7499137
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/activity/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/activity/Utilization.txt
index 129a72e,0000000..129a72e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/Utilization.txt
+++ b/core/doc/admin/_sources/apps/activity/Utilization.txt
diff --cc core/doc/admin/_sources/apps/activity/index.txt
index c40cbc8,0000000..c40cbc8
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/activity/index.txt
+++ b/core/doc/admin/_sources/apps/activity/index.txt
diff --cc core/doc/admin/_sources/apps/admin_dependencies_chk/Configuration.txt
index f1f9712,0000000..f1f9712
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/admin_dependencies_chk/Configuration.txt
+++ b/core/doc/admin/_sources/apps/admin_dependencies_chk/Configuration.txt
diff --cc core/doc/admin/_sources/apps/admin_dependencies_chk/Introduction.txt
index f434f8e,0000000..f434f8e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/admin_dependencies_chk/Introduction.txt
+++ b/core/doc/admin/_sources/apps/admin_dependencies_chk/Introduction.txt
diff --cc core/doc/admin/_sources/apps/admin_dependencies_chk/Table_of_Contents.txt
index 3dcf50a,0000000..3dcf50a
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/admin_dependencies_chk/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/admin_dependencies_chk/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/admin_dependencies_chk/Utilization.txt
index 9007ddd,0000000..9007ddd
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/admin_dependencies_chk/Utilization.txt
+++ b/core/doc/admin/_sources/apps/admin_dependencies_chk/Utilization.txt
diff --cc core/doc/admin/_sources/apps/admin_dependencies_chk/index.txt
index d0c0996,0000000..d0c0996
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/admin_dependencies_chk/index.txt
+++ b/core/doc/admin/_sources/apps/admin_dependencies_chk/index.txt
diff --cc core/doc/admin/_sources/apps/files_antivirus/Configuration.txt
index 779170a,0000000..779170a
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_antivirus/Configuration.txt
+++ b/core/doc/admin/_sources/apps/files_antivirus/Configuration.txt
diff --cc core/doc/admin/_sources/apps/files_antivirus/Introduction.txt
index c86722a,0000000..c86722a
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_antivirus/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_antivirus/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_antivirus/Table_of_Contents.txt
index cfc8715,0000000..cfc8715
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_antivirus/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/files_antivirus/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/files_antivirus/index.txt
index 0456002,0000000..0456002
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_antivirus/index.txt
+++ b/core/doc/admin/_sources/apps/files_antivirus/index.txt
diff --cc core/doc/admin/_sources/apps/files_encryption/Configuration.txt
index a863f13,0000000..a863f13
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_encryption/Configuration.txt
+++ b/core/doc/admin/_sources/apps/files_encryption/Configuration.txt
diff --cc core/doc/admin/_sources/apps/files_encryption/File_Systems.txt
index 6e86ca6,0000000..6e86ca6
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_encryption/File_Systems.txt
+++ b/core/doc/admin/_sources/apps/files_encryption/File_Systems.txt
diff --cc core/doc/admin/_sources/apps/files_encryption/Introduction.txt
index 8b68ac5,0000000..8b68ac5
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_encryption/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_encryption/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_encryption/Table_of_Contents.txt
index 0b4fcbb,0000000..0b4fcbb
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_encryption/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/files_encryption/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/files_encryption/index.txt
index 9c66e4b,0000000..9c66e4b
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_encryption/index.txt
+++ b/core/doc/admin/_sources/apps/files_encryption/index.txt
diff --cc core/doc/admin/_sources/apps/files_external/Configuration.txt
index ce5ab7c,0000000..ce5ab7c
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_external/Configuration.txt
+++ b/core/doc/admin/_sources/apps/files_external/Configuration.txt
diff --cc core/doc/admin/_sources/apps/files_external/Introduction.txt
index ca389e3,0000000..ca389e3
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_external/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_external/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_external/Table_of_Contents.txt
index 162a6ff,0000000..162a6ff
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_external/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/files_external/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/files_external/index.txt
index 4b32d69,0000000..4b32d69
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_external/index.txt
+++ b/core/doc/admin/_sources/apps/files_external/index.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/Configuration.txt
index 988922e,0000000..988922e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/Configuration.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/Configuration.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/Introduction.txt
index 2998e99,0000000..2998e99
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/Retrieving_shared_data.txt
index f3c104d,0000000..f3c104d
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/Retrieving_shared_data.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/Retrieving_shared_data.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/Table_of_Contents.txt
index 7ab3243,0000000..7ab3243
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/Utilization.txt
index af59df9,0000000..af59df9
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/Utilization.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/Utilization.txt
diff --cc core/doc/admin/_sources/apps/files_sharing/index.txt
index 8d0385b,0000000..8d0385b
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_sharing/index.txt
+++ b/core/doc/admin/_sources/apps/files_sharing/index.txt
diff --cc core/doc/admin/_sources/apps/files_trashbin/Configuration_and_storage_.txt
index b0b9a90,0000000..b0b9a90
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_trashbin/Configuration_and_storage_.txt
+++ b/core/doc/admin/_sources/apps/files_trashbin/Configuration_and_storage_.txt
diff --cc core/doc/admin/_sources/apps/files_trashbin/Introduction.txt
index 098b100,0000000..098b100
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_trashbin/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_trashbin/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_trashbin/Table_of_Contents.txt
index cd13f7f,0000000..cd13f7f
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_trashbin/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/files_trashbin/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/files_trashbin/Utilization.txt
index 9252ca4,0000000..9252ca4
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_trashbin/Utilization.txt
+++ b/core/doc/admin/_sources/apps/files_trashbin/Utilization.txt
diff --cc core/doc/admin/_sources/apps/files_trashbin/index.txt
index 13fea91,0000000..13fea91
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_trashbin/index.txt
+++ b/core/doc/admin/_sources/apps/files_trashbin/index.txt
diff --cc core/doc/admin/_sources/apps/files_versions/Configuration_and_storage.txt
index 6005bf9,0000000..6005bf9
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_versions/Configuration_and_storage.txt
+++ b/core/doc/admin/_sources/apps/files_versions/Configuration_and_storage.txt
diff --cc core/doc/admin/_sources/apps/files_versions/Introduction.txt
index 6c51e69,0000000..6c51e69
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_versions/Introduction.txt
+++ b/core/doc/admin/_sources/apps/files_versions/Introduction.txt
diff --cc core/doc/admin/_sources/apps/files_versions/Utilization.txt
index 7bf9c7c,0000000..7bf9c7c
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_versions/Utilization.txt
+++ b/core/doc/admin/_sources/apps/files_versions/Utilization.txt
diff --cc core/doc/admin/_sources/apps/files_versions/index.txt
index 66e4cf2,0000000..66e4cf2
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/files_versions/index.txt
+++ b/core/doc/admin/_sources/apps/files_versions/index.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/Configuration.txt
index a37ee09,0000000..a37ee09
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/Configuration.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/Configuration.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/Introduction.txt
index 301dfff,0000000..301dfff
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/Introduction.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/Introduction.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/Links.txt
index 97618d7,0000000..97618d7
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/Links.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/Links.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/Table_of_Contents.txt
index 4b801cc,0000000..4b801cc
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/Usage.txt
index 4653123,0000000..4653123
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/Usage.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/Usage.txt
diff --cc core/doc/admin/_sources/apps/firstrunwizard/index.txt
index 1f1cc34,0000000..1f1cc34
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/firstrunwizard/index.txt
+++ b/core/doc/admin/_sources/apps/firstrunwizard/index.txt
diff --cc core/doc/admin/_sources/apps/user_ldap/CONFIGURATION.txt
index 5076ffe,0000000..5076ffe
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/user_ldap/CONFIGURATION.txt
+++ b/core/doc/admin/_sources/apps/user_ldap/CONFIGURATION.txt
diff --cc core/doc/admin/_sources/apps/user_ldap/Introduction.txt
index 7bbdc5e,0000000..7bbdc5e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/user_ldap/Introduction.txt
+++ b/core/doc/admin/_sources/apps/user_ldap/Introduction.txt
diff --cc core/doc/admin/_sources/apps/user_ldap/Table_of_Contents.txt
index 1739b9e,0000000..1739b9e
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/user_ldap/Table_of_Contents.txt
+++ b/core/doc/admin/_sources/apps/user_ldap/Table_of_Contents.txt
diff --cc core/doc/admin/_sources/apps/user_ldap/index.txt
index 48bbbf3,0000000..48bbbf3
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/user_ldap/index.txt
+++ b/core/doc/admin/_sources/apps/user_ldap/index.txt
diff --cc core/doc/admin/_sources/apps/viewers/Configuration.txt
index a600030,0000000..a600030
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/viewers/Configuration.txt
+++ b/core/doc/admin/_sources/apps/viewers/Configuration.txt
diff --cc core/doc/admin/_sources/apps/viewers/Introduction.txt
index 3d80eef,0000000..3d80eef
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/viewers/Introduction.txt
+++ b/core/doc/admin/_sources/apps/viewers/Introduction.txt
diff --cc core/doc/admin/_sources/apps/viewers/Utilization.txt
index 3fe22a9,0000000..3fe22a9
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/viewers/Utilization.txt
+++ b/core/doc/admin/_sources/apps/viewers/Utilization.txt
diff --cc core/doc/admin/_sources/apps/viewers/index.txt
index 8bae6a8,0000000..8bae6a8
mode 100644,000000..100644
--- a/core/doc/admin/_sources/apps/viewers/index.txt
+++ b/core/doc/admin/_sources/apps/viewers/index.txt
diff --cc core/doc/admin/_sources/configuration/auth_ldap.txt
index 55952b4,0000000..d4c54e7
mode 100644,000000..100644
--- a/core/doc/admin/_sources/configuration/auth_ldap.txt
+++ b/core/doc/admin/_sources/configuration/auth_ldap.txt
@@@ -1,615 -1,0 +1,616 @@@
+User Authentication with LDAP
+=============================
+
+ownCloud ships an LDAP backend, which allows full use of ownCloud for user
+logging in with LDAP credentials including:
+
+* LDAP group support
+* File sharing with users and groups
+* Access via WebDAV and of course ownCloud Desktop Client
+* Versioning, external Storages and all other ownCloud goodies
+
+To connect to an LDAP server the configuration needs to be set up properly.
+Once the LDAP backend is activated (Apps Sidebar→Apps, choose **LDAP user and
+group backend**, click on **Enable**) the configuration can be found on
+Settings→Admin. Read on for a detailed description of the configuration fields.
+
+Configuration
+-------------
+
+The LDAP backend follows a wizard-like approach, splitted into four tabs. A
+correctly completed first tab ("Server") is mandatory to access the other tabs.
+Also, the other tabs need to be reviewed by the admin, however the necessary
+settings are detected automatically. An indicator will show whether the
+configuration is incomplete, incorrect or OK.
+
+The settings are changed automatically, as soon as a input element looses the
+focus, i.e. the cursor is taken away by clicking somewhere else or pressing the
+tabulator key.
+
+The other tabs can be navigated by clicking the tabs or by using the *Continue*
+and *Back* buttons. They are located on the lower right, next to the status
+indicator.
+
+Server
+~~~~~~
+
+The server tab contains the basic information on the LDAP server. They make sure
+that ownCloud will be able to connect to LDAP and be able to read data from
+there. The admin at least needs to provide a hostname. If anonymous access is
+not possible he will need to provide an account DN and a password, too. ownCloud
+attempts to auto-detect the port and the base DN.
+
+.. figure:: ../images/ldap-wizard-1-server.png
+
+Server configuration:
+ ownCloud can be configured to connect to multiple LDAP servers. Using this
+ control you can pick a configuration you want to edit or add a new one. The
+ button **Delete Configuration** deletes the current configuration.
+
+Host:
+ The host name of the LDAP server. It can also be a **ldaps://** URI, for
+ instance.
+
+ It is also possible to pass a port number, which speeds up port detection. It
+ is especially useful, if a custom port is used. ownCloud will move the value
+ to the port field subsequently.
+
+ Examples:
+
+ * *directory.my-company.com*
+ * *ldaps://directory.my-company.com*
+ * *directory.my-company.com:9876*
+
+Port:
+ The port on which to connect to the LDAP server. The field is disabled in the
+ beginning of a new configuration. The port will be detected automatically,
+ if the LDAP server is running on a standard port. After ownCloud attempted to
+ determine the port, the field will be enabled for user input. A successfully
+ found port will be inserted by ownCloud, of course.
+
+ Example:
+
+ * *389*
+
+User DN:
+ The name as DN of a user who is able to do searches in the LDAP
+ directory. Leave it empty for anonymous access. It is recommended to have a
+ special system user for ownCloud.
+
+ Example:
+
+ * *uid=owncloudsystemuser,cn=sysusers,dc=my-company,dc=com*
+
+Password:
+ The password for the user given above. Empty for anonymous access.
+
+Base DN:
+ The base DN of LDAP, from where all users and groups can be reached. Separated
+ Base DNs for users and groups can be set in the Advanced tab. Nevertheless,
+ this field is mandatory. ownCloud attempts to determine the Base DN according
+ to the provided User DN or the provided Host.
+
+ Example:
+
+ * *dc=my-company,dc=com*
+
+User Filter
+~~~~~~~~~~~
+
+The settings in the user filter tab determine which LDAP users will appear and
+are allowed to log in into ownCloud. It is also possible to enter a raw LDAP
+filter.
+
+.. figure:: ../images/ldap-wizard-2-user.png
+
+only those object classes:
+ ownCloud will determine the object classes that are typically availalble for
+ (ideally only) user objects in your LDAP. ownCloud will automatically select
+ the object class that returns the highest amount of users. You can select
+ multiple object classes.
+
+only from those groups:
+ If your LDAP server supports the member-of-overlay in LDAP filters, you can
+ define that only users from one or more certain groups are allowed to
+ appear and log in into ownCloud. By default, no value will be selected. You
+ can select multiple groups.
+
+ If your LDAP server does not support the member-of-overlay in LDAP filters,
+ the input field is disabled. Please contact your LDAP administrator.
+
+Edit raw filter instead:
+ Clicking on this text will toggle the filter mode. Instead of the assisted
+ approach, you can enter the raw LDAP filter directly in the appearing field.
+
+ Example:
+
+ * *objectClass=inetOrgPerson*
+
+x users found:
+ This is an indicator that tells you approximately how many users will be
+ allowed to access ownCloud. The number will update after any change you do.
+
+Login Filter
+~~~~~~~~~~~~
+
+The settings in the login filter tab determine which user detail will be
+compared to the login value entered by the user. It is possible to allow
+multiple user details. It is also possible to enter a raw LDAP filter.
+
+The user limitation as set up in the previous tab is in effect, unless you
+manually configure the filter in raw mode.
+
+.. figure:: ../images/ldap-wizard-3-login.png
+
+LDAP Username:
+ If this value is checked, the login value will be compared to the username in
+ the LDAP directory. The corresponding attribute, usually *uid* or
+ *samaccountname* will be detected automatically by ownCloud.
+
+LDAP Email Address:
+ If this value is checked, the login value will be compared to an email address
+ in the LDAP directory. The email address will be looked for in the
+ *mailPrimaryAddress* and *mail* attributes.
+
+Other Attributes:
+ This multiselect box allows you to select other attributes for the comparison.
+ The list is generated automatically based on the attributes that a user object
+ contains in your LDAP server.
+
+Edit raw filter instead:
+ Clicking on this text will toggle the filter mode. Instead of the assisted
+ approach, you can enter the raw LDAP filter directly in the appearing field.
+
+ The **%uid** placeholder will be replaced with the login name entered by the user
+ upon login. When you enter the filter manually.
+
+ Examples:
+
+ * only username: *uid=%uid*
+ * username or email address: *(|(uid=%uid)(mail=$uid))*
+
+Group Filter
+~~~~~~~~~~~~
+
+The settings in the group filter tab determine which groups will be availalble
+in ownCloud. It does not have any restrictions on logins, this has been dealed
+with in the prior tabs. It is also possible to enter a raw LDAP
+filter.
+
+By default, no groups will be availalble in ownCloud. You actively need to
+enable groups.
+
+.. figure:: ../images/ldap-wizard-4-group.png
+
+only those object classes:
+ ownCloud will determine the object classes that are typically availalble for
+ (ideally only) group objects in your LDAP. ownCloud will only list object
+ classes that return at least one group object. You can select multiple
+ object classes. A typical object class is "group", or "posixGroup".
+
+only from those groups:
+ This setting lets you pick certain groups that shall be availalble in
+ ownCloud. This field follows a whitelist approach. ownCloud will generate a
+ list of available groups found in your LDAP server. You can select multiple
+ groups.
+
+Edit raw filter instead:
+ Clicking on this text will toggle the filter mode. Instead of the assisted
+ approach, you can enter the raw LDAP filter directly in the appearing field.
+
+ Example:
+
+ * *objectClass=group*
+ * *objectClass=posixGroup*
+
+y groups found:
+ This is an indicator that tells you approximately how many groups will be
+ available in ownCloud. The number will update after any change you do.
+
+
+Advanced Settings
+-----------------
+
+In the LDAP Advanced settings section you can define options, that are less
+common to set. They are not needed for a working connection. It can also have a
+positive effect on the performance to specify distinguished bases for user and
+group searches.
+
+The Advanced Settings are structured into three parts:
+
+* Connection Settings
+* Directory Settings
+* Special Attributes
+
+Connection Settings
+~~~~~~~~~~~~~~~~~~~
+
+.. figure:: ../images/ldap-advanced-1-connection.png
+
+ LDAP Advanced Settings, section Connection Settings
+
+Configuration Active:
+ Enables or Disables the current configuration. Disabled configuration will not
+ connect to the LDAP server.
+
+ By default, it is turned off. It will be automatically turned on, when using
+ the wizard and the configuration is OK and a test connection successful.
+
+Backup (Replica) Host:
+ A backup server can be defined here. ownCloud tries to connect to the backup
+ server automatically, when the main host (as specified in basic settings)
+ cannot be reached. It is import that the backup server is a replica of the
+ main server, because the object UUIDs must match.
+
+ Example:
+
+ * *directory2.my-company.com*
+
+Backup (Replica) Port:
+ The port on which to connect to the backup LDAP server. If no port is given,
+ but a host, then the main port (as specified above) will be used.
+
+ Example:
+
+ * *389*
+
+Disable Main Server:
+ You can manually override the main server and make ownCloud only connect to
+ the backup server. It may be handy for planned downtimes.
+
+Case insensitive LDAP server (Windows):
+ Whether the LDAP server is running on a Windows Host. Usually, it is not
+ necessary to check it, however.
+
+Turn off SSL certificate validation:
+ Turns of check of valid SSL certificates. Use it – if needed –
+ for testing, only!
+
+Cache Time-To-Live:
+ A cache is introduced to avoid unnecessary LDAP traffic,
+ for example lookups check whether the users exists on every page request or
+ WebDAV interaction. It is also supposed to speed up the Admin → User page or
+ list of users to share with, once it is populated. Saving the configuration
+ empties the cache (changes are not necessary). The time is given in seconds.
+
+ Note that almost every PHP request would require to build up a new connection
+ to the LDAP server. If you require a most up-to-dateness it is recommended not
+ to totally switch off the cache, but define a minimum life time of 15s.
+
+ Examples:
+
+ * ten minutes: *600*
+ * one hour: *3600*
+
+Directory Settings
+~~~~~~~~~~~~~~~~~~~
+
+.. figure:: ../images/ldap-advanced-2-directory.png
+
+ LDAP Advanced Settings, section Directory Settings
+
+User Display Name Field:
+ The attribute that should be used as display name in ownCloud.
+
+ * Example: *displayName*
+
+Base User Tree:
+ The base DN of LDAP, from where all users can be reached. It needs to be given
+ completely despite to the Base DN from the Basic settings. You can specify
+ multiple base trees, one in each line.
+
+ * Example:
+
+ | *cn=programmers,dc=my-company,dc=com*
+ | *cn=designers,dc=my-company,dc=com*
+
+User Search Attributes:
+ These attributes are used when a search for users is done. This happens, for
+ instance, in the share dialogue. By default the user display name attribute as
+ specified above is being used. Multiple attributes can be given, one in each
+ line.
+
+ Beware that if an attribute is not available on a user object, the user will
+ neither be listed (e.g. in the share dialogue) nor be able to login. This also
+ affects the display name attribute as specified above. If you override the
+ default, the display name attribute will not be taken into account, unless you
+ specify it as well.
+
+ * Example:
+
+ | *displayName*
+ | *mail*
+
+Group Display Name Field:
+ The attribute that should be used as ownCloud group name. ownCloud allows a
+ limited set of characters (a-zA-Z0-9.-_@), every other character will be
+ replaced in ownCloud. Once a group name is assigned, it will not be changed,
+ i.e. changing this value will only have effect to new LDAP groups.
+
+ * Example: *cn*
+
+Base Group Tree:
+ The base DN of LDAP, from where all groups can be reached.
+ It needs to be given completely despite to the Base DN from the Basic
+ settings. You can specify multiple base trees, one in each line.
+
+ * Example:
+
+ | *cn=barcelona,dc=my-company,dc=com*
+ | *cn=madrid,dc=my-company,dc=com*
+
+Group Search Attributes:
+ These attributes are used when a search for groups is done. This happens, for
+ instance, in the share dialogue. By default the group display name attribute
+ as specified above is being used. Multiple attributes can be given, one in
+ each line.
+
+ If you override the default, the group display name attribute will not be
+ taken into account, unless you specify it as well.
+
+ * Example:
+
+ | *cn*
+ | *description*
+
+Group Member association:
+ The attribute that is used to indicate group memberships, i.e. the attribute
+ used by LDAP groups to refer to their users.
+
+ ownCloud detects the value automatically, you should only change it, if you
+ have a very valid reason and know what you are doing.
+
+ * Example: *uniquemember*
+
+Special Attributes
+~~~~~~~~~~~~~~~~~~
+
+.. figure:: ../images/ldap-advanced-3-attributes.png
+
+ LDAP Advanced Settings, section Special Attributes
+
+Quota Field:
+ ownCloud can read an LDAP attribute and set the user quota according to its
+ value. Specify the attribute here, otherwise keep it empty. The attribute
+ shall return human readable values, e.g. "2 GB".
+
+ * Example: *ownCloudQuota*
+
+Quota Default:
+ Override ownCloud default quota for LDAP users who do not
+ have a quota set in the attribute given above.
+
+ * Example: *15 GB*
+
+Email Field:
+ ownCloud can read an LDAP attribute and set the user email
+ there from. Specify the attribute here, otherwise keep it empty.
+
+ Although the wizard offers you to check login by email, the correct email
+ attribute is not detected and you need to specify it manually.
+
+ * Example: *mail*
+
+User Home Folder Naming Rule:
+ By default, the ownCloud creates the user
+ directory, where all files and meta data are kept, according to the ownCloud
+ user name. You may want to override this setting and name it after an
+ attribute value. The attribute given can also return an absolute path, e.g.
+ ``/mnt/storage43/alice``. Leave it empty for default behavior.
+
+ * Example: *cn*
+
+Expert Settings
+---------------
+
+.. figure:: ../images/ldap-expert.png
+
+In the Expert Settings fundamental behavior can be adjusted to your needs. The
+configuration should be done before starting production use or when testing the
+installation.
+
+Internal Username:
+ The internal username is the identifier in ownCloud for LDAP users. By default
+ it will be created from the UUID attribute. By using the UUID attribute it is
+ made sure that the username is unique and characters do not need to be
+ converted. The internal username has the restriction that only these
+ characters are allowed: [\a-\zA-\Z0-\9_. at -]. Other characters are replaced with
+ their ASCII correspondence or are simply omitted.
+
+ The LDAP backend ensures that there are no duplicate internal usernames in
+ ownCloud, i.e. that it is checking all other activated user backends
+ (including local ownCloud users). On collisions a random number (between 1000
+ and 9999) will be attached to the retrieved value. For example, if "alice"
+ exists, the next username may be "alice_1337".
+
+ The internal username is also the default name for the user home folder in
+ ownCloud. It is also a part of remote URLs, for instance for all \*DAV services.
+ With this setting the default behaviour can be overridden.
+
+ Leave it empty for default behaviour. Changes will have effect only on newly
+ mapped (added) LDAP users.
+
+ * Example: *uid*
+
+Override UUID detection
+ By default, ownCloud auto-detects the UUID attribute. The UUID attribute is
+ used to doubtlessly identify LDAP users and groups. Also, the internal
+ username will be created based on the UUID, if not specified otherwise above.
+
+ You can override the setting and pass an attribute of your choice. You must
+ make sure that the attribute of your choice can be fetched for both users and
+ groups and it is unique. Leave it empty for default behaviour. Changes will
+ have effect only on newly mapped (added) LDAP users and groups. It also will
+ have effect when a user's or group's DN changes and an old UUID was cached: It
+ will result in a new user. Because of this, the setting should be applied
+ before putting ownCloud in production use and cleaning the bindings
+ (see below).
+
+ * Example: *cn*
+
+Username-LDAP User Mapping
+ ownCloud uses the usernames as key to store and assign data. In order to
+ precisely identify and recognize users, each LDAP user will have a internal
+ username in ownCloud. This requires a mapping from ownCloud username to LDAP
+ user. The created username is mapped to the UUID of the LDAP user.
+ Additionally the DN is cached as well to reduce LDAP interaction, but it is
+ not used for identification. If the DN changes, the change will be detected by
+ ownCloud by checking the UUID value.
+
+ The same is valid for groups.
+
+ The internal ownCloud name is used all over in ownCloud. Clearing the Mappings
+ will have leftovers everywhere. Do never clear the mappings
+ in a production environment. Only clear mappings in a testing or experimental
+ stage.
+
+ **Clearing the Mappings is not configuration sensitive, it affects all LDAP
+ configurations!**
+
+Testing the configuration
+-------------------------
+
+In this version we introduced the **Test Configuration** button on the bottom
+of the LDAP settings section. It will always check the values as currently
+given in the input fields. You do not need to save before testing. By clicking
+on the button, ownCloud will try to bind to the ownCloud server with the
+settings currently given in the input fields. The response will look like this:
+
+.. figure:: ../images/ldap-settings-invalid-oc45.png
+
+ Failure
+
+In case the configuration fails, you can see details in ownCloud's log, which
+is in the data directory and called **owncloud.log** or on the bottom the
+**Settings → Admin page**. Unfortunately it requires a reload – sorry for the
+inconvenience.
+
+.. figure:: ../images/ldap-settings-valid-oc45.png
+
+ Success
+
+In this case, Save the settings. You can check if the users and groups are
+fetched correctly on the Settings → Users page.
+
+ownCloud Avatar integration
+---------------------------
+
+ownCloud 6 incorporates a user profile picture feature, called Avatar. If a user
- has a photo stored in the *jpegPhoto* attribute, it will be used as Avatar. The
- user then is not able to change his avatar in the personal settings. It must be
- done within LDAP.
++has a photo stored in the *jpegPhoto* or, since 6.0.2, *thumbnailPhoto*
++attribute, it will be used as Avatar. The user then is not able to change his
++avatar in the personal settings. It must be done within LDAP. *jpegPhoto* is
++preferred over *thumbnailPhoto*.
+
+.. figure:: ../images/ldap-fetched-avatar.png
+
+ Profile picture fetched from LDAP, Personal Settings
+
- If the *jpegPhoto* attribute is not set or empty, the default ownCloud behaviour
- is active, i.e. the user will be able to set and change his profile picture in
- the personal settings. If the user sets a profile picture within ownCloud it
- will _not_ be stored in LDAP.
++If the *jpegPhoto* or *thumbnailPhoto* attribute is not set or empty, the
++default ownCloud behaviour is active, i.e. the user will be able to set and
++change his profile picture in the personal settings. If the user sets a profile
++picture within ownCloud it will _not_ be stored in LDAP.
+
- The *jpegPhoto* attribute will be fetched once a day to make sure the current
- photo from LDAP is used in ownCloud. If a picture is added later, a possibly set
- profile picture will be overridden with the LDAP one. If a photo stored in the
- *jpegPhoto* attribute is deleted later, the last profile picture in ownCloud
- will still be used.
++The *jpegPhoto* or *thumbnailPhoto* attribute will be fetched once a day to make
++sure the current photo from LDAP is used in ownCloud. If a picture is added
++later, a possibly set profile picture will be overridden with the LDAP one. If a
++photo stored in the *jpegPhoto* and/or *thumbnailPhoto* attribute is deleted
++later, the last profile picture in ownCloud will still be used.
+
+The photo taken from LDAP will be adjusted to the requirements of the ownCloud
+avatar automatically. I.e. it will be transformed into a square. If the photo
+needs to be cut, it will be done equally from both affected sides. The original
+photo stored in LDAP will stay the same, of course.
+
+Troubleshooting, Tips and Tricks
+--------------------------------
+
+SSL Certificate Verification (LDAPS, TLS)
+-----------------------------------------
+
+A common mistake with SSL certificates is that they may not be known to PHP.
+If you have trouble with certificate validation make sure that
+
+* you have the certificate of the server installed on the ownCloud server
+* the certificate is announced in the system's LDAP configuration file (usually
+ */etc/ldap/ldap.conf* on Linux, *C:\\openldap\\sysconf\\ldap.conf* or
+ *C:\\ldap.conf* on Windows) using a **TLS_CACERT /path/to/cert** line.
+* Using LDAPS, also make sure that the port is correctly configured (by default
+ 686)
+
+Microsoft Active Directory
+--------------------------
+
+Compared to earlier ownCloud versions, no further tweaks need to be done to
+make ownCloud work with Active Directory. ownCloud will automatically find the
+correct configuration in the wizard-like set up process.
+
+Duplicating Server Configurations
+---------------------------------
+
+In case you have a working configuration and want to create a similar one or
+"snapshot" configurations before modifying them you can do the following:
+
+#. Go to the **Server** tab
+#. On **Server Configuration** choose *Add Server Configuration*
+#. Answer the question *Take over settings from recent server configuration?*
+ with *yes*.
+#. (optional) Switch to **Advanced** tab and uncheck **Configuration Active**
+ in the *Connection Settings*, so the new configuration is not used on Save
+#. Click on **Save**
+
+Now you can modify the configuration and enable it if you wish.
+
+ownCloud LDAP Internals
+-----------------------
+
+Some parts of how the LDAP backend works are described here. May it be helpful.
+
+Groups
+------
+
+At the moment, only secondary groups are read. That means that only the groups
+are retrieved, which are returned by the attribute auto-detected (or manually
+chosen) in Group-Member association. Primary groups are not being taken into
+account.
+
+User and Group Mapping
+----------------------
+
+In ownCloud the user or group name is used to have all relevant information in
+the database assigned. To work reliably a permanent internal user name and
+group name is created and mapped to the LDAP DN and UUID. If the DN changes in
+LDAP it will be detected, there will be no conflicts.
+
+Those mappings are done in the database table ldap_user_mapping and
+ldap_group_mapping. The user name is also used for the user's folder (except
+something else is specified in *User Home Folder Naming Rule*), which
+contains files and meta data.
+
+As of ownCloud 5 internal user name and a visible display name are separated.
+This is not the case for group names, yet, i.e. group cannot be altered.
+
+That means that your LDAP configuration should be good and ready before putting
+it into production. The mapping tables are filled early, but as long as you are
+testing, you can empty the tables any time. Do not do this in production. If you
+want to rename a group, be very careful. Do not rename the user's internal name.
+
+Caching
+-------
+
+For performance reasons a cache has been introduced to ownCloud. He we store
+all users and groups, group memberships or internal userExists-requests. Since
+ownCloud is written in PHP and each and every page request (also done by Ajax)
+loads ownCloud and would execute one or more LDAP queries again, you do want to
+have some of those queries cached and save those requests and traffic. It is
+highly recommended to have the cache filled for a small amount of time, which
+comes also very handy when using the sync client, as it is yet another request
+for PHP.
+
+Handling with Backup Server
+---------------------------
+
+When ownCloud is not able to contact the main server, he will be treated as
+offline and no connection attempts will be done for the time specified in
+**Cache Time-To-Live**. If a backup server is configured, it will be connected
+instead. If you plan a maintained downtime, check **Disable Main Server** for
+the time being to avoid unnecessary connection attempts every now and then.
diff --cc core/doc/admin/_sources/index.txt
index 2a04202,0000000..62ad694
mode 100644,000000..100644
--- a/core/doc/admin/_sources/index.txt
+++ b/core/doc/admin/_sources/index.txt
@@@ -1,81 -1,0 +1,81 @@@
- ===================
- Admin Documentation
- ===================
++======================================
++ownCloud |version| Admin Documentation
++======================================
+
+Introduction
+============
+
+This is the administrators manual for ownCloud, a flexible, open source file
+sync and share solution. It comprises of the ownCloud server, as well as client
+applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and
+mobile clients for the Android and Apple iOS operating system.
+
+Target audience
+---------------
+
+This guide is targeted towards people who want to install, administer and
+optimize ownCloud Server. If you want to learn how to use the Web UI, or how to
+install clients on the server, please refer to the `User Manual`_ or the `Desktop
+Client Manual`_ respectively.
+
+.. _`User Manual`: http://doc.owncloud.com/
+.. _`Desktop Client Manual`: http://doc.owncloud.com/
+
+Structure of this document
+--------------------------
+
+The next chapters describes how to set up ownCloud Server on different platforms
+and operating systems, as well as how to update existing installations.
+
+Further chapters will then detail on integrating ownCloud into your existing
+environment, e.g. how to setup LDAP or how to mount your storage.
+
+
+Installation
+============
+This chapter will introduce you to the installation of ownCloud in different scenarios.
+
+If you want to just try ownCloud in a virtual machine without any configuration, check the section
+:doc:`installation/installation_appliance`, where you will find ready-to-use images.
+
+* :doc:`installation/installation_linux` (recommended)
+* :doc:`installation/installation_windows`
+* :doc:`installation/installation_source`
+* :doc:`installation/installation_others`
+* :doc:`installation/installation_ucs`
+* :doc:`installation/installation_macos` (not supported)
+* :doc:`installation/installation_appliance`
+
+Configuration
+=============
+This chapter covers ownCloud and web server configuration.
+
+* :doc:`configuration/configuration_apps`
+* :doc:`configuration/configuration_users`
+* :doc:`configuration/configuration_database`
+* :doc:`configuration/auth_ldap`
+* :doc:`configuration/custom_mount_config_gui`
+* :doc:`configuration/custom_mount_config`
+* :doc:`configuration/background_jobs`
+* :doc:`configuration/configuration_mail`
+* :doc:`configuration/configuration_automation`
+* :doc:`configuration/configuration_encryption`
+* :doc:`configuration/configuring_big_file_upload`
+* :doc:`configuration/configuration_reverseproxy`
+* :doc:`configuration/xsendfile`
+* :doc:`configuration/configuration_3rdparty`
+* :doc:`configuration/custom_user_backend`
+* :doc:`configuration/configuration_custom_clients`
+* :doc:`configuration/configuration_maintenance`
+* :doc:`configuration/configuration_knowledgebase`
+* :doc:`configuration/configuration_logging`
+* :doc:`configuration/configuration_language`
+
+Maintenance
+===========
+This chapter covers maintenance tasks such as updating or migrating to a new version.
+
+* :doc:`maintenance/migrating`
+* :doc:`maintenance/update`
+
+
diff --cc core/doc/admin/_sources/installation/installation_source.txt
index b41306d,0000000..bd2e523
mode 100644,000000..100644
--- a/core/doc/admin/_sources/installation/installation_source.txt
+++ b/core/doc/admin/_sources/installation/installation_source.txt
@@@ -1,573 -1,0 +1,574 @@@
+Manual Installation
+-------------------
+
+If you do not want to use packages, here is how you setup ownCloud on
+from scratch using a classic :abbr:`LAMP (Linux, Apache, MySQL, PHP)` setup:
+
+This document provides a complete walk-through for installing ownCloud
+on Ubuntu 12.04 LTS Server with Apache and MySQL.
+It also provides guidelines for installing it on other distributions,
+webservers and database systems.
+
+Prerequisites
+~~~~~~~~~~~~~
+
+.. note:: This tutorial assumes you have terminal access to the machine you want
+ to install owncloud on. Although this is not an absolute requirement,
+ installation without it is highly likely to require contacting your
+ hoster (e.g. for installing required modules).
+
+To run ownCloud, your web server must have the following installed:
+
+* PHP (>= 5.3.3 minimum, 5.4 or higher recommended)
+* PHP module ctype
+* PHP module dom
+* PHP module GD
+* PHP module iconv
+* PHP module JSON
+* PHP module libxml
+* PHP module mb multibyte
+* PHP module SimpleXML
+* PHP module zip
+* PHP module zlib
+
+Database connectors (pick at least one):
+
+* PHP module sqlite (>= 3, usually not recommendable for performance reasons)
+* PHP module mysql
+* PHP module pgsql (requires PostgreSQL >= 9.0)
+
+*Recommended* packages:
+
+* PHP module curl (highly recommended, some functionality, e.g. http user
+ authentication, depends on this)
+* PHP module fileinfo (highly recommended, enhances file analysis performance)
+* PHP module bz2 (recommended, required for extraction of apps)
+* PHP module intl (increases language translation performance)
+* PHP module mcrypt (increases file encryption performance)
+* PHP module openssl (required for accessing HTTPS resources)
+
+Required for specific apps (if you use the mentioned app, you must install that
+package):
+
+* PHP module ldap (for ldap integration)
+* smbclient (for SMB storage)
+* PHP module ftp (for FTP storage)
+
+Recommended for specific apps (*optional*):
+
+* PHP module exif (for image rotation in pictures app)
+
+For enhanced performance (*optional* / select only one of the following):
+
+* PHP module apc
+* PHP module apcu
+* PHP module xcache
+
+For preview generation (*optional*):
+
+* PHP module imagick
+* avconv or ffmpeg
+* OpenOffice or libreOffice
+
+**Remarks:**
+
+* Please check your distribution, operating system or hosting partner documentation
+ on how to install/enable these modules.
+
+* Make sure your distribution's php version fulfils the version requirements
+ specified above. If it doesn't, there might be custom repositories you can use.
+ If you are e.g. running Ubuntu 10.04 LTS, you can update your
+ PHP using a custom `PHP PPA`_:
+ ::
+
+ sudo add-apt-repository ppa:ondrej/php5
+ sudo apt-get update
+ sudo apt-get install php5
+
+* You don’t need any WebDAV support module for your web server (i.e. Apache’s
+ mod_webdav) to access your ownCloud data via WebDAV. ownCloud has a built-in
+ WebDAV server of its own.
+
+Example installation on Ubuntu 12.04.4 LTS Server
+*************************************************
+On a machine running a pristine Ubuntu 12.04.4 LTS server, you would install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MySQL by issuing the following commands in a terminal:
+::
+
+ sudo apt-get install apache2 mysql-server libapache2-mod-php5
+ sudo apt-get install php5-gd php5-json php5-mysql php5-curl
+ sudo apt-get install php5-intl php5-mcrypt php5-imagick
+
+**Remarks:**
+
+* If you want to use any other combination of distribution, webserver or database,
+ please consult the respective documentation.
+
+* At the execution of each of the above commands you might be prompted whether you
+ want to continue; press "Y" for Yes (that is if your system language is English.
+ You might have to press a different key if you have a different system language).
+
+* At the installation of the MySQL server, you will be prompted for a root password.
+ Be sure to remember that password for later use.
+
+* This installs the packages for the ownCloud core system. If you are planning on
+ running additional apps, keep in mind that they might require additional packages.
+ See the list above for details.
+
+Download, extract and copy ownCloud to Your Web Server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, download the archive of the latest ownCloud version:
+
+* Navigate to `http://owncloud.org/install`
+* Click "Tar or Zip file"
+* In the opening dialog, chose the "Linux" link.
+* This will start the download of a file named owncloud-x.y.z.tar.bz2 (where
+ x.y.z is the version number of the current latest version).
+* Save this file on the machine you want to install ownCloud on.
+* If that's a different machine than the one you are currently working on, use
+ e.g. FTP to transfer the downloaded archive file there.
+* Note down the directory where you put the file.
+* Extract the archive contents. Open a terminal on the machine
+ you plan to run ownCloud on, and run:
+ ::
+
+ cd path/to/downloaded/archive
+ tar -xjf owncloud-x.y.z.tar.bz2
+
+ where :code:`path/to/downloaded/archive` is to be replaced by the path where you
+ put the downloaded archive, and x.y.z of course has to be replaced by the actual
+ version number as in the file you have downloaded.
+
+* Copy the ownCloud files to their final destination in the document root of your
+ webserver (you can skip this step if you already downloaded and extracted the
+ files there):
+ ::
+
+ sudo cp -r owncloud /path/to/your/webserver/document-root
+
+
+ * If you don't know where your webserver's document root is located, consult its
+ documentation. For Apache on Ubuntu 12.04 LTS for example, this would usually be
+ :code:`/var/www`. So above command should look like this:
+ ::
+
+ sudo cp -r owncloud /var/www
+
+ * The above assumes you want to install ownCloud into a subdirectory "owncloud"
+ on your webserver. For installing it anywhere else, you'll have to adapt the
+ above command accordingly.
+
+Set the Directory Permissions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The user running your web server must own at least the apps/, data/ and config/
+directories in your ownCloud installation folder.
+The following command will change the ownership of the whole folder to that user.
+
+* For Debian-based distributions (like Ubuntu, Debian or Linux Mint) and Gentoo, run:
+ ::
+
+ sudo chown -R www-data:www-data /path/to/your/owncloud
+
+* Continuing the example from above, for Ubuntu 12.04 LTS, where the install location
+ was :code:`/var/www`, you would run:
+ ::
+
+ sudo chown -R www-data:www-data /var/www/owncloud
+
+* For ArchLinux should run (as root):
+ ::
+
+ chown -R http:http /path/to/your/owncloud
+
+* Fedora users should run (as root):
+ ::
+
+ chown -R apache:apache /path/to/your/owncloud
+
+When using an NFS mount for the data directory, do not change ownership as above.
+The simple act of mounting the drive will set proper permissions for ownCloud to
+write to the directory. Changing ownership as above could result in some issues
+if the NFS mount is lost.
+
+Web Server Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: You can use ownCloud over plain http, but we strongly encourage you to
+ use SSL/TLS. If you don't use it, and you for example access your
+ ownCloud over an unsecured WiFi, everyone in the same WiFi can grab
+ your authentication data or the content of files synchronized while you
+ are on the WiFi.
+
+Apache is the recommended web server.
+
+Apache Configuration
+********************
+
+Enabling SSL
+............
+
+An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run
+::
+
+ sudo a2enmod ssl
+ sudo a2ensite default-ssl
+ sudo service apache2 reload
+
+If you are using a different distribution, check their documentation on how to
+enable SSL.
+
+.. note:: Self-signed certificates have their drawbacks - especially when you
+ plan to make your ownCloud server publicly accessible. You might want
+ to consider getting a certificate signed by an official signing
+ authority. If you're looking for a free certificate, you can consult
+ e.g. this article:
+ `https://www.sslshopper.com/article-free-ssl-certificates-from-a-free-certificate-authority.html`
+
+Configuring ownCloud
+....................
+
+Since there was a change in the way versions 2.2 and 2.4 are configured,
+you'll have to find out which Apache version you are using.
+
+Usually you can do this by running one of the following commands:
+::
+
+ sudo apachectl -v
+ apache2 -v
+
+Example output:
+::
+
+ Server version: Apache/2.2.22 (Ubuntu)
+ Server built: Jul 12 2013 13:37:10
+
+This indicates an Apache of the 2.2 version branch (as e.g. you will find on
+Ubuntu 12.04 LTS).
+
+Example config for Apache 2.2:
+
+.. code-block:: xml
+
+ <Directory /path/to/your/owncloud/install>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+
+Example config for Apache 2.4:
+
+.. code-block:: xml
+
+ <Directory /path/to/your/owncloud/install>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Require all granted
+ </Directory>
+
+* This config entry needs to go into the configuration file of the "site" you want
+ to use.
+* On a Ubuntu system, this typically is the "default-ssl" site (to be found at
+ :code:`/etc/apache2/sites-available/default-ssl`).
+* Edit the site file with your favorite editor (note that you'll need root
+ permissions to modify that file). For Ubuntu 12.04 LTS, you could for example run
+ the following command in a Terminal:
+ ::
+
+ sudo nano /etc/apache2/sites-available/default-ssl
+
+* Add the entry shown above immediately before the line containing
+ ::
+
+ </VirtualHost>
+
+ (this should be one of the last lines in the file).
+
+* For ownCloud to work correctly, we need the module mod_rewrite. Enable it by running::
+
+ sudo a2enmod rewrite
+
+* In distributions that do not come with a2enmod the module needs to be enabled
+ manually by editing the config Apache files, usually :file:`/etc/httpd/httpd.conf`.
+ consult the Apache documentation or your distributions documentation.
+
+* Then restart Apache.
+
+ * For Ubuntu systems (or distributions using upstartd), run::
+
+ sudo service apache2 restart
+
+ * For systemd systems (Fedora, ArchLinux, OpenSUSE), run::
+
+ systemctl restart httpd.service
+
+* In order for the maximum upload size to be configurable, the .htaccess file in the
+ ownCloud folder needs to be made writable by the server (this should already be done,
+ see section `Set the Directory Permissions`_).
+
+* You should make sure that any built-in WebDAV module of your web server is disabled
+ (at least for the ownCloud directory), as it will interfere with ownCloud's
+ built-in WebDAV support.
+
+ If you need the WebDAV support in the rest of your configuration, you can turn it off
+ specifically for the ownCloud entry by adding the following line in the
+ configuration of your ownCloud. In above "<Directory ..." code, add the following line
+ directly after the "allow from all" / "Require all granted" line):
+ ::
+
+ Dav Off
+
+* Furthermore, you need to disable any server-configured authentication for ownCloud, as
+ it's internally using Basic authentication for its \*DAV services.
+ If you have turned on authentication on a parent folder (via e.g. an "AuthType Basic"
+ directive), you can turn off the authentication specifically for the ownCloud entry;
+ to do so, in above "<Directory ..." code, add the following line directly after the
+ "allow from all" / "Require all granted" line):
+ ::
+
+ Satisfy Any
+
+A minimal site configuration on Ubuntu 12.04 might look like this:
+
+.. code-block:: xml
++
+ <IfModule mod_ssl.c>
+ <VirtualHost _default_:443>
+ ServerName YourServerName
+ ServerAdmin webmaster at localhost
+ DocumentRoot /var/www
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ LogLevel warn
+ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ <Directory /var/www/owncloud>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+ # add any possibly required additional directives here
+ # e.g. the Satisfy directive:
+ Satisfy Any
+ </Directory>
+ </VirtualHost>
+ </IfModule>
+
+When using ssl, take special note on the ServerName. You should specify one in the
+server configuration, as well as in the CommonName field of the certificate. If you want
+your ownCloud to be reachable via the internet, then set both these to the domain you
+want to reach your ownCloud under.
+
+.. note:: By default, the certificates' CommonName will get set to the host name at the time
+ when the ssl-cert package was installed.
+
+Nginx Configuration
+*******************
+
+- You need to insert the following code into **your nginx config file.**
+- Adjust **server_name**, **root**, **ssl_certificate** and **ssl_certificate_key** to suit your needs.
+- Make sure your SSL certificates are readable by the server (see `http://wiki.nginx.org/HttpSslModule`_).
+
+.. code-block:: python
+
+ upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
+ }
+
+ server {
+ listen 80;
+ server_name cloud.example.com;
+ return 301 https://$server_name$request_uri; # enforce https
+ }
+
+ server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Path to the root of your installation
+ root /var/www/;
+
+ client_max_body_size 10G; # set max upload size
+ fastcgi_buffers 64 4K;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+ location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
+ deny all;
+ }
+
+ location / {
+ # The following 2 rules are only needed with webfinger
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+
+ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
+ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
+
+ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
+ try_files $uri $uri/ index.php;
+ }
+
+ location ~ ^(.+?\.php)(/.*)?$ {
+ try_files $1 = 404;
+
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$1;
+ fastcgi_param PATH_INFO $2;
+ fastcgi_param HTTPS on;
+ fastcgi_pass php-handler;
+ }
+
+ # Optional: set long EXPIRES header on static assets
+ location ~* ^.+\.(jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
+ expires 30d;
+ # Optional: Don't log access to assets
+ access_log off;
+ }
+
+ }
+
+To enable SSL support:
+- Remove the server block containing the redirect
+- Change **listen 443 ssl** to **listen 80;**
+- Remove **ssl_certificate** and **ssl_certificate_key**.
+- Remove **fastcgi_params HTTPS on;**
+
+.. note:: If you want to effectively increase maximum upload size you will also
+ have to modify your **php-fpm configuration** (**usually at
+ /etc/php5/fpm/php.ini**) and increase **upload_max_filesize** and
+ **post_max_size** values. You’ll need to restart php5-fpm and nginx
+ services in order these changes to be applied.
+
+Lighttpd Configuration
+**********************
+
+This assumes that you are familiar with installing PHP application on
+lighttpd.
+
+It is important to note that the **.htaccess** files used by ownCloud to protect the **data** folder are ignored by
+lighttpd, so you have to secure it by yourself, otherwise your **owncloud.db** database and user data are publicly
+readable even if directory listing is off. You need to add two snippets to your lighttpd configuration file:
+
+Disable access to data folder::
+
+ $HTTP["url"] =~ "^/owncloud/data/" {
+ url.access-deny = ("")
+ }
+
+Disable directory listing::
+
+ $HTTP["url"] =~ "^/owncloud($|/)" {
+ dir-listing.activate = "disable"
+ }
+
+Yaws Configuration
+******************
+
+This should be in your **yaws_server.conf**. In the configuration file, the
+**dir_listings = false** is important and also the redirect from **/data**
+to somewhere else, because files will be saved in this directory and it
+should not be accessible from the outside. A configuration file would look
+like this
+
+.. code-block:: xml
+
+ <server owncloud.myserver.com/>
+ port = 80
+ listen = 0.0.0.0
+ docroot = /var/www/owncloud/src
+ allowed_scripts = php
+ php_handler = <cgi, /usr/local/bin/php-cgi>
+ errormod_404 = yaws_404_to_index_php
+ access_log = false
+ dir_listings = false
+ <redirect>
+ /data == /
+ </redirect>
+ </server>
+
+
+The Apache **.htaccess** file that comes with ownCloud is configured to
+redirect requests to nonexistent pages. To emulate that behaviour, you
+need a custom error handler for yaws. See this `github gist for further instructions`_ on how to create and compile that error handler.
+
+Hiawatha Configuration
+**********************
+
+Add **WebDAVapp = yes** to the ownCloud virtual host. Users accessing
+WebDAV from MacOS will also need to add **AllowDotFiles = yes**.
+
+Disable access to data folder::
+
+ UrlToolkit {
+ ToolkitID = denyData
+ Match ^/data DenyAccess
+ }
+
+
+
+Microsoft Internet Information Server (IIS)
+*******************************************
+
+See :doc:`installation_windows` for further instructions.
+
+Follow the Install Wizard
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Open your web browser and navigate to your ownCloud instance. If you are
+installing ownCloud on the same machine as you will access the install wizard
+from, the url will be: http://localhost/ (or http://localhost/owncloud).
+
+For basic installs we recommend SQLite as it is easy to setup (ownCloud will do it for you). For larger installs you
+should use MySQL or PostgreSQL. Click on the Advanced options to show the configuration options. You may enter admin
+credentials and let ownCloud create its own database user, or enter a preconfigured user. If you are not using Apache
+as the web server, please set the data directory to a location outside of the document root. See the advanced
+install settings.
+
+
+.. _PHP PPA: https://launchpad.net/~ondrej/+archive/php5
+.. _github gist for further instructions: https://gist.github.com/2200407
+.. _`http://wiki.nginx.org/HttpSslModule`: http://wiki.nginx.org/HttpSslModule
diff --cc core/doc/admin/apps/activity/Configuration.html
index d8ac147,0000000..bca1feb
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/Configuration.html
+++ b/core/doc/admin/apps/activity/Configuration.html
@@@ -1,150 -1,0 +1,150 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<p>The Activity App is enabled by default.
+To verify or to disable, navigate to the
+APPS
+page and search for
+Activity.</p>
- <p><img alt="10000000000002F3000000926CA65D02_png" src="../_images/10000000000002F3000000926CA65D02.png" style="width: 6.5in; height: 1.2571in;" /></p>
++<p><img alt="10000000000002F3000000926CA65D02_png" src="../../_images/10000000000002F3000000926CA65D02.png" style="width: 6.5in; height: 1.2571in;" /></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/activity/Introduction.html
index b4d3751,0000000..c7731ff
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/Introduction.html
+++ b/core/doc/admin/apps/activity/Introduction.html
@@@ -1,153 -1,0 +1,153 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Activity app shows an activity feed where users can see what they did in the past and what happened to their files and what others did with their shared files.</p>
+<p>The Activity Stream introduces a central interface where all events that happen in a user’s ownCloud instance are shown.</p>
+<p>The following can be seen in the new interface:</p>
+<ul class="simple">
+<li>Creation, edit or deletion of files along with a thumbnail and date and path</li>
+<li>If someone shared a file with you</li>
+<li>If someone created, edited or deleted something in a folder you shared to them.</li>
+</ul>
+<p>All the events are presented with endless scrolling and also in an RSS feed which a user can subscribe to.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/activity/RSS_Feed.html
index 49de415,0000000..76d3b6d
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/RSS_Feed.html
+++ b/core/doc/admin/apps/activity/RSS_Feed.html
@@@ -1,156 -1,0 +1,156 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>RSS Feed — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="rss-feed">
+<h1>RSS Feed<a class="headerlink" href="#rss-feed" title="Permalink to this headline">¶</a></h1>
+<p>To subscribe to the RSS Feed, navigate to the
+Activity
+page and select
+RSS feed
+in the upper right of the browser.</p>
- <p><img alt="10000000000001440000005A2989832F_png" src="../_images/10000000000001440000005A2989832F.png" style="width: 3.3752in; height: 0.9374in;" /></p>
++<p><img alt="10000000000001440000005A2989832F_png" src="../../_images/10000000000001440000005A2989832F.png" style="width: 3.3752in; height: 0.9374in;" /></p>
+<p>The resulting page will look something like this:</p>
- <p><img alt="10000000000002B1000002258C08D304_png" src="../_images/10000000000002B1000002258C08D304.png" style="width: 6.5in; height: 5.1791in;" /></p>
++<p><img alt="10000000000002B1000002258C08D304_png" src="../../_images/10000000000002B1000002258C08D304.png" style="width: 6.5in; height: 5.1791in;" /></p>
+<p>To subscribe, select the
+Subscribe Now
+button.</p>
+<p>The RSS Feed may be viewed via the browser’s capabilities.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/activity/Table_of_Contents.html
index 9076a1f,0000000..f4d14de
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/Table_of_Contents.html
+++ b/core/doc/admin/apps/activity/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc373137976>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/activity/Utilization.html
index 3770a71,0000000..019a762
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/Utilization.html
+++ b/core/doc/admin/apps/activity/Utilization.html
@@@ -1,205 -1,0 +1,205 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>The Activities can be viewed by selecting
+Activity
+in the App bar on the left side of the ownCloud browser interface</p>
- <p><img alt="1000000000000050000000DB83B8FA5B_png" src="../_images/1000000000000050000000DB83B8FA5B.png" style="width: 0.8335in; height: 2.2811in;" /></p>
++<p><img alt="1000000000000050000000DB83B8FA5B_png" src="../../_images/1000000000000050000000DB83B8FA5B.png" style="width: 0.8335in; height: 2.2811in;" /></p>
+<p>This will bring up the Activity interface showing all the activities which occurred for this user’s instance.</p>
+<div class="section" id="sample-activities">
+<h2>Sample Activities<a class="headerlink" href="#sample-activities" title="Permalink to this headline">¶</a></h2>
+<p>This section will show how the different activities may appear within this interface</p>
+<div class="section" id="create-file">
+<h3>Create file<a class="headerlink" href="#create-file" title="Permalink to this headline">¶</a></h3>
+<p>The following shows a file entitled
+DeleteMe.txt
+being created 3 days ago.</p>
- <p><img alt="10000000000000F300000068AF0ECD53_png" src="../_images/10000000000000F300000068AF0ECD53.png" style="width: 2.5311in; height: 1.0835in;" /></p>
++<p><img alt="10000000000000F300000068AF0ECD53_png" src="../../_images/10000000000000F300000068AF0ECD53.png" style="width: 2.5311in; height: 1.0835in;" /></p>
+</div>
+<div class="section" id="delete-file">
+<h3>Delete File<a class="headerlink" href="#delete-file" title="Permalink to this headline">¶</a></h3>
+<p>The following shows a file entitled
+DeleteMe.txt
+being deleted 3 days ago.</p>
- <p><img alt="10000000000000F5000000675DC5F68C_png" src="../_images/10000000000000F5000000675DC5F68C.png" style="width: 2.552in; height: 1.0728in;" /></p>
++<p><img alt="10000000000000F5000000675DC5F68C_png" src="../../_images/10000000000000F5000000675DC5F68C.png" style="width: 2.552in; height: 1.0728in;" /></p>
+</div>
+<div class="section" id="edit-a-file">
+<h3>Edit a file<a class="headerlink" href="#edit-a-file" title="Permalink to this headline">¶</a></h3>
+<p>The following shows a file
+Shared/test.txt
+being edited mere seconds ago.</p>
- <p><img alt="10000000000000F1000000F6704F46D3_png" src="../_images/10000000000000F1000000F6704F46D3.png" style="width: 2.5102in; height: 2.5626in;" /></p>
++<p><img alt="10000000000000F1000000F6704F46D3_png" src="../../_images/10000000000000F1000000F6704F46D3.png" style="width: 2.5102in; height: 2.5626in;" /></p>
+</div>
+<div class="section" id="share-a-file-with-a-user">
+<h3>Share a file with a user<a class="headerlink" href="#share-a-file-with-a-user" title="Permalink to this headline">¶</a></h3>
+<p>The following shows the file
+shareMe
+being shared with another user.</p>
- <p><img alt="10000000000000F1000000F56125BDBA_png" src="../_images/10000000000000F1000000F56125BDBA.png" style="width: 2.5102in; height: 2.552in;" /></p>
++<p><img alt="10000000000000F1000000F56125BDBA_png" src="../../_images/10000000000000F1000000F56125BDBA.png" style="width: 2.5102in; height: 2.552in;" /></p>
+</div>
+<div class="section" id="file-shared-to-user">
+<h3>File shared to user<a class="headerlink" href="#file-shared-to-user" title="Permalink to this headline">¶</a></h3>
+<p>The following shows the file
+Shared/test.txt
+being shared with this user almost an hour ago.</p>
- <p><img alt="10000000000000F60000006754ED2A1E_png" src="../_images/10000000000000F60000006754ED2A1E.png" style="width: 2.5626in; height: 1.0728in;" /></p>
++<p><img alt="10000000000000F60000006754ED2A1E_png" src="../../_images/10000000000000F60000006754ED2A1E.png" style="width: 2.5626in; height: 1.0728in;" /></p>
+</div>
+<div class="section" id="file-created-by-another-user-in-shared-folder">
+<h3>File created by another user in Shared folder<a class="headerlink" href="#file-created-by-another-user-in-shared-folder" title="Permalink to this headline">¶</a></h3>
+<p>The following is shown when another user creates a file in your shared folder.</p>
- <p><img alt="10000000000000F500000067A8845EF8_png" src="../_images/10000000000000F500000067A8845EF8.png" style="width: 2.552in; height: 1.0728in;" /></p>
++<p><img alt="10000000000000F500000067A8845EF8_png" src="../../_images/10000000000000F500000067A8845EF8.png" style="width: 2.552in; height: 1.0728in;" /></p>
+</div>
+<div class="section" id="shared-file-modified">
+<h3>Shared file modified<a class="headerlink" href="#shared-file-modified" title="Permalink to this headline">¶</a></h3>
+<p>The following shows a file
+BoB/test.txt
+modified by a user who this file was shared to.</p>
- <p><img alt="10000000000000F6000000685DFB3767_png" src="../_images/10000000000000F6000000685DFB3767.png" style="width: 2.5626in; height: 1.0835in;" /></p>
++<p><img alt="10000000000000F6000000685DFB3767_png" src="../../_images/10000000000000F6000000685DFB3767.png" style="width: 2.5626in; height: 1.0835in;" /></p>
+</div>
+<div class="section" id="combined-activities">
+<h3>Combined activities<a class="headerlink" href="#combined-activities" title="Permalink to this headline">¶</a></h3>
+<p>The following shows what “combined” activities may look like on the activity interface.</p>
- <p><img alt="10000000000000F40000019A110DD159_png" src="../_images/10000000000000F40000019A110DD159.png" style="width: 2.5417in; height: 4.2701in;" /></p>
++<p><img alt="10000000000000F40000019A110DD159_png" src="../../_images/10000000000000F40000019A110DD159.png" style="width: 2.5417in; height: 4.2701in;" /></p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/activity/index.html
index 1e77c9d,0000000..b049953
mode 100644,000000..100644
--- a/core/doc/admin/apps/activity/index.html
+++ b/core/doc/admin/apps/activity/index.html
@@@ -1,154 -1,0 +1,154 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Activity</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#sample-activities">Sample Activities</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="RSS_Feed.html">RSS Feed</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/Configuration.html
index d235b04,0000000..635e151
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/Configuration.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/Configuration.html
@@@ -1,147 -1,0 +1,147 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<p>By default, the ownCloud Dependencies App is disabled.
+To enable, navigate to the Apps page and select “ownCloud dependencies info” and enable.</p>
- <p><img alt="10000000000001C9000000AF9C1CE57F_png" src="../_images/10000000000001C9000000AF9C1CE57F.png" style="width: 4.7602in; height: 1.8228in;" /></p>
++<p><img alt="10000000000001C9000000AF9C1CE57F_png" src="../../_images/10000000000001C9000000AF9C1CE57F.png" style="width: 4.7602in; height: 1.8228in;" /></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/Introduction.html
index 580a6b8,0000000..757e09d
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/Introduction.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/Introduction.html
@@@ -1,146 -1,0 +1,146 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Dependencies App provides a list of modules required to run the current setup of ownCloud.
+All of the modules listed should be installed on the base operating system prior to using ownCloud.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/Table_of_Contents.html
index c3e7e60,0000000..6ab6991
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/Table_of_Contents.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374602312>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/Utilization.html
index 47e5bc5,0000000..458e4ef
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/Utilization.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/Utilization.html
@@@ -1,150 -1,0 +1,150 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>Once this app is enabled, navigate to the Admin page and scroll to “Dependencies status”.
+This section will show a list of all modules required to execute this ownCloud setup as well as what part of ownCloud uses the given module.</p>
- <p><img alt="100000000000013C0000017D4FC6CEF5_png" src="../_images/100000000000013C0000017D4FC6CEF5.png" style="width: 3.2917in; height: 3.9689in;" /></p>
++<p><img alt="100000000000013C0000017D4FC6CEF5_png" src="../../_images/100000000000013C0000017D4FC6CEF5.png" style="width: 3.2917in; height: 3.9689in;" /></p>
+<p>Modules in green are required and have been installed.
+Modules in red are required yet have not been installed.
+It is recommended to install these modules prior to using ownCloud.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/admin_dependencies_chk/index.html
index 86fe62e,0000000..0a8b50a
mode 100644,000000..100644
--- a/core/doc/admin/apps/admin_dependencies_chk/index.html
+++ b/core/doc/admin/apps/admin_dependencies_chk/index.html
@@@ -1,150 -1,0 +1,150 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Dependencies</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_antivirus/Configuration.html
index a59cd55,0000000..9be684d
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_antivirus/Configuration.html
+++ b/core/doc/admin/apps/files_antivirus/Configuration.html
@@@ -1,202 -1,0 +1,202 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="enable-the-app">
+<h2>Enable The app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h2>
+<p>To enable the Antivirus App, navigate to the Apps page and select “Antivirus App for Files” and enable.</p>
- <p><img alt="10000000000001800000009A9494E037_png" src="../_images/10000000000001800000009A9494E037.png" style="width: 4in; height: 1.6043in;" /></p>
++<p><img alt="10000000000001800000009A9494E037_png" src="../../_images/10000000000001800000009A9494E037.png" style="width: 4in; height: 1.6043in;" /></p>
+</div>
+<div class="section" id="install-clamav">
+<h2>Install ClamAV<a class="headerlink" href="#install-clamav" title="Permalink to this headline">¶</a></h2>
+<p>ClamAV must be installed on the server (either the local for Executable or Daemon Socket mode or a remote server for Daemon mode).</p>
+<p>To install, use the repository’s installation method to install “clamav”.
+For example:</p>
+<p>#apt-get install clamav</p>
+<p>For daemon mode, the ClamAV daemon must also be installed (either on the local machine for Daemon Socket or the remote machine for daemon mode).</p>
+<p>#apt-get install clamav-daemon</p>
+</div>
+<div class="section" id="configure-logging">
+<h2>Configure Logging<a class="headerlink" href="#configure-logging" title="Permalink to this headline">¶</a></h2>
+<p>Set log level to Everything in the Admin page.</p>
- <p><img alt="10000000000001AC000000477C76808F_png" src="../_images/10000000000001AC000000477C76808F.png" style="width: 4.4583in; height: 0.7398in;" /></p>
++<p><img alt="10000000000001AC000000477C76808F_png" src="../../_images/10000000000001AC000000477C76808F.png" style="width: 4.4583in; height: 0.7398in;" /></p>
+</div>
+<div class="section" id="executable-mode">
+<h2>Executable Mode<a class="headerlink" href="#executable-mode" title="Permalink to this headline">¶</a></h2>
+<p>To run in executable mode, ClamAV must be installed on the local server.
+From the Admin page, configure Antivirus as follows:</p>
- <p><img alt="1000000000000165000000D3FF2168AB_png" src="../_images/1000000000000165000000D3FF2168AB.png" style="width: 3.7189in; height: 2.198in;" /></p>
++<p><img alt="1000000000000165000000D3FF2168AB_png" src="../../_images/1000000000000165000000D3FF2168AB.png" style="width: 3.7189in; height: 2.198in;" /></p>
+<p>The Stream Length is defined as the ClamAV StreamMaxLengeth Size.
+The default value, according to the ClamAV web site is 10M which equates to 10485760 bytes as shown in the above example.</p>
+<p>The Path to clamscan is the path for the executable clamscan file.
+By default it installs in /usr/bin/clamscan.</p>
+<p>When files are uploaded, they will be scanned and, if clean, the following logs will appear:</p>
+<p>{“app”:”files_antivirus”,”message”:”Scanning file : /Lab.txt”,”level”:0,”time”:”2013-12-17T15:24:05+00:00”}</p>
+<p>{“app”:”files_antivirus”,”message”:”Exec scan: /Lab.txt”,”level”:0,”time”:”2013-12-17T15:24:05+00:00”}</p>
+<p>{“app”:”files_antivirus”,”message”:”Result CLEAN!”,”level”:0,”time”:”2013-12-17T15:24:09+00:00”}</p>
+</div>
+<div class="section" id="daemon-mode">
+<h2>Daemon Mode<a class="headerlink" href="#daemon-mode" title="Permalink to this headline">¶</a></h2>
+<p>When running in Daemon Mode, install ClamAV and clamAV-Daemon on a remote server.</p>
+<p>The port, upon which ClamAV listens must be configured.
+To do this, add the following line in /etc/clamav/clamd.conf:</p>
+<p>TCPSocket 3310</p>
+<p>Then restart the Clamd service:</p>
+<p>/etc/init.d/clamav-daemon restart</p>
+<p>Back on the ownCloud server, navigate to the Admin page and configure the Antivirus Configuration as follows:</p>
- <p><img alt="1000000000000194000000FAD39BC0D8_png" src="../_images/1000000000000194000000FAD39BC0D8.png" style="width: 4.2083in; height: 2.6043in;" /></p>
++<p><img alt="1000000000000194000000FAD39BC0D8_png" src="../../_images/1000000000000194000000FAD39BC0D8.png" style="width: 4.2083in; height: 2.6043in;" /></p>
+<p>Where the host is the IP of the server running the ClamAV Daemon and the Port is what was configured in the above step.</p>
+<p>Upon upload of files to the ownCloud server, the following logs will appear indicating the files are clean.</p>
+<p>{“app”:”files_antivirus”,”message”:”Scanning file : /Lab.txt”,”level”:0,”time”:”2013-12-17T17:39:35+00:00”}</p>
+<p>{“app”:”files_antivirus”,”message”:”Response :: stream: OKn”,”level”:0,”time”:”2013-12-17T17:39:48+00:00”}</p>
+</div>
+<div class="section" id="daemon-socket-mode">
+<h2>Daemon Socket mode<a class="headerlink" href="#daemon-socket-mode" title="Permalink to this headline">¶</a></h2>
+<p>To run in Daemon socket mode, install clamav and clamav-daemon on the ownCloud server.</p>
+<p>Configure the Admin page as such:</p>
- <p><img alt="1000000000000160000000DBB2FB0223_png" src="../_images/1000000000000160000000DBB2FB0223.png" style="width: 3.6665in; height: 2.2811in;" /></p>
++<p><img alt="1000000000000160000000DBB2FB0223_png" src="../../_images/1000000000000160000000DBB2FB0223.png" style="width: 3.6665in; height: 2.2811in;" /></p>
+<p>Where Socket is the location of the Clamd executable.</p>
+<p>Upon upload of a clean file to the ownCloud server, the following logs will appear.</p>
+<p>{“app”:”files_antivirus”,”message”:”Scanning file : /Lab.txt”,”level”:0,”time”:”2013-12-17T18:19:08+00:00”}</p>
+<p>{“app”:”files_antivirus”,”message”:”Response :: stream: OKn”,”level”:0,”time”:”2013-12-17T18:19:08+00:00”}</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_antivirus/Introduction.html
index 240142f,0000000..86b176c
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_antivirus/Introduction.html
+++ b/core/doc/admin/apps/files_antivirus/Introduction.html
@@@ -1,161 -1,0 +1,161 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud integrates with ClamAV, an open source (GPL) antivirus engine, to provide an antivirus solution for files which are uploaded to the ownCloud server.
+Via this method, ownCloud/ClamAV can detect Trojans, viruses, malware and other malicious threats.
+Files are scanned for virus upon initial upload to the ownCloud server.</p>
+<p>The ownCloud antivirus app is supported on ownCloud instances which are installed on a Linux operating system.</p>
+<p>The antivirus app can run in one of three modes:</p>
+<ul class="simple">
+<li>Executable – ClamAV is running on the same server as the ownCloud instance.
+For executable mode, the ClamAV process is started and stopped with each file upload.</li>
+<li>Daemon – ClamAV is running on a different server from the ownCloud instance</li>
+<li>Daemon (Socket) – ClamAV is running on the same server as the ownCloud instance. In this mode, the ClamAV process is running in the background at all times.
+It is a bit quicker for scanning than executable mode, but requires system administrator skills and root access.</li>
+</ul>
+<p>In addition, there are two possible actions which may occur when an infected file is found:</p>
+<ul class="simple">
+<li>Only Log – A log entry is created when an infected file is found.</li>
+<li>Delete File – The infected file is deleted.</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_antivirus/Table_of_Contents.html
index dd0500e,0000000..aeb9fb6
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_antivirus/Table_of_Contents.html
+++ b/core/doc/admin/apps/files_antivirus/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc375553047>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_antivirus/index.html
index add9493,0000000..353f65b
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_antivirus/index.html
+++ b/core/doc/admin/apps/files_antivirus/index.html
@@@ -1,157 -1,0 +1,157 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Antivirus</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#enable-the-app">Enable The app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#install-clamav">Install ClamAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#configure-logging">Configure Logging</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#executable-mode">Executable Mode</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#daemon-mode">Daemon Mode</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#daemon-socket-mode">Daemon Socket mode</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_encryption/Configuration.html
index 51fdf04,0000000..83c86e7
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/Configuration.html
+++ b/core/doc/admin/apps/files_encryption/Configuration.html
@@@ -1,180 -1,0 +1,180 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<p>To enable the encryption app, navigate to the Apps page and select Encryption, then enable.</p>
- <p><img alt="10000000000001A3000000AAFE82893A_png" src="../_images/10000000000001A3000000AAFE82893A.png" style="width: 4.3646in; height: 1.7701in;" /></p>
++<p><img alt="10000000000001A3000000AAFE82893A_png" src="../../_images/10000000000001A3000000AAFE82893A.png" style="width: 4.3646in; height: 1.7701in;" /></p>
+<p>Once the app is enabled, the following message will appear for all users currently logged into the web browser as they navigate to a new page within the ownCloud web browser</p>
- <p><img alt="10000000000001BF00000012349EAE2F_png" src="../_images/10000000000001BF00000012349EAE2F.png" style="width: 4.6563in; height: 0.1874in;" /></p>
++<p><img alt="10000000000001BF00000012349EAE2F_png" src="../../_images/10000000000001BF00000012349EAE2F.png" style="width: 4.6563in; height: 0.1874in;" /></p>
+<p>It is necessary to logout of ownCloud and re-login to initialize the encryption keys.</p>
+<div class="section" id="recovery-key">
+<h2>Recovery Key<a class="headerlink" href="#recovery-key" title="Permalink to this headline">¶</a></h2>
+<p>Enabling the recovery key globally is done by the admin.
+Each user then has the option as to whether they wish to do so for their own account.
+If enabled, the admin will be able to reset the user’s encryption password using a predefined recovery password.
+This allows for the recovery of a user’s files in the event of a password loss.
+If recovery key is not enabled, there is no way to restore files if the login password is lost.</p>
+<div class="section" id="admin-level">
+<h3>Admin level<a class="headerlink" href="#admin-level" title="Permalink to this headline">¶</a></h3>
+<p>To enable the recovery key, the Admin must first enable this feature in the Admin page.</p>
- <p><img alt="100000000000018E000000C4BA62B2A3_png" src="../_images/100000000000018E000000C4BA62B2A3.png" style="width: 4.1457in; height: 2.0417in;" /></p>
++<p><img alt="100000000000018E000000C4BA62B2A3_png" src="../../_images/100000000000018E000000C4BA62B2A3.png" style="width: 4.1457in; height: 2.0417in;" /></p>
+<p>Once enabled, the Admin may change the recovery key password at any time.</p>
- <p><img alt="1000000000000193000001AE9AB8B0A2_png" src="../_images/1000000000000193000001AE9AB8B0A2.png" style="width: 4.198in; height: 4.4791in;" /></p>
++<p><img alt="1000000000000193000001AE9AB8B0A2_png" src="../../_images/1000000000000193000001AE9AB8B0A2.png" style="width: 4.198in; height: 4.4791in;" /></p>
+</div>
+<div class="section" id="user-level">
+<h3>User level<a class="headerlink" href="#user-level" title="Permalink to this headline">¶</a></h3>
+<p>The user can then navigate to the Personal page and enable password recovery.</p>
- <p><img alt="1000000000000227000000935D9B1EF6_png" src="../_images/1000000000000227000000935D9B1EF6.png" style="width: 5.7398in; height: 1.5311in;" /></p>
++<p><img alt="1000000000000227000000935D9B1EF6_png" src="../../_images/1000000000000227000000935D9B1EF6.png" style="width: 5.7398in; height: 1.5311in;" /></p>
+</div>
+<div class="section" id="recovery">
+<h3>Recovery<a class="headerlink" href="#recovery" title="Permalink to this headline">¶</a></h3>
+<p>In order for the admin to recover the user’s files in the event of a lost password, the admin should navigate to the “Users” tab and enter the Recovery Key Password into the “Admin Recovery Password” field at the top of the page.</p>
- <p><img alt="10000000000003730000002B6865E951_png" src="../_images/10000000000003730000002B6865E951.png" style="width: 6.5in; height: 0.3165in;" /></p>
++<p><img alt="10000000000003730000002B6865E951_png" src="../../_images/10000000000003730000002B6865E951.png" style="width: 6.5in; height: 0.3165in;" /></p>
+<p>This will allow the admin to generate a new encryption password for the user.</p>
+<ul class="simple">
+<li>For local user management, this will generate both a new log-in password as well as a new encryption password for the data.</li>
+<li>If LDAP authentication is in use, the admin would need to set the new log-in password in the LDAP server, and then enter the same password in the user management page for the encryption key.
+It is important that both the password in the LDAP server and the password entered in the user management page are identical.</li>
+</ul>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_encryption/File_Systems.html
index 1493abd,0000000..1aedd26
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/File_Systems.html
+++ b/core/doc/admin/apps/files_encryption/File_Systems.html
@@@ -1,160 -1,0 +1,160 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>File Systems — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="file-systems">
+<h1>File Systems<a class="headerlink" href="#file-systems" title="Permalink to this headline">¶</a></h1>
+<p>Once enabled, all files within ownCloud are encrypted, with the exceptions mentioned above.
+This includes files in local storage, as well as files contained within external storage mounts.</p>
+<p>The encryption app creates several key files/folders when enabled.
+~/data/public-keys contains the public keys for all users, and ~/data/owncloud_private_keys contains system wide private keys utilized for public link shares as well as the recovery key.</p>
- <p><img alt="10000000000002C700000048F3729BAA_png" src="../_images/10000000000002C700000048F3729BAA.png" style="width: 6.5in; height: 0.6583in;" /></p>
++<p><img alt="10000000000002C700000048F3729BAA_png" src="../../_images/10000000000002C700000048F3729BAA.png" style="width: 6.5in; height: 0.6583in;" /></p>
+<p>The encryption app stores key information in the ~/data/<user>/files_encryption directory.</p>
- <p><img alt="100000000000024400000027BEE1E4A9_png" src="../_images/100000000000024400000027BEE1E4A9.png" style="width: 6.0417in; height: 0.4063in;" /></p>
++<p><img alt="100000000000024400000027BEE1E4A9_png" src="../../_images/100000000000024400000027BEE1E4A9.png" style="width: 6.0417in; height: 0.4063in;" /></p>
+<p>As mentioned previously, the private key is generated from the user’s password.</p>
+<p>Each file that the user owns will have a corresponding keyfile maintained in the keyfiles directory.</p>
- <p><img alt="100000000000026E0000003672ADCB6E_png" src="../_images/100000000000026E0000003672ADCB6E.png" style="width: 6.4791in; height: 0.5626in;" /></p>
++<p><img alt="100000000000026E0000003672ADCB6E_png" src="../../_images/100000000000026E0000003672ADCB6E.png" style="width: 6.4791in; height: 0.5626in;" /></p>
+<p>In addition a share key will be generated for each file in the event that there is an external storage mount by the admin for multiple users or groups.</p>
- <p><img alt="100000000000029F000000B8A83D0275_png" src="../_images/100000000000029F000000B8A83D0275.png" style="width: 6.5in; height: 1.7819in;" /></p>
++<p><img alt="100000000000029F000000B8A83D0275_png" src="../../_images/100000000000029F000000B8A83D0275.png" style="width: 6.5in; height: 1.7819in;" /></p>
+<p>When viewing a file directly on the ownCloud data directory, it will show up as encrypted.</p>
- <p><img alt="10000000000002B30000003A5B960711_png" src="../_images/10000000000002B30000003A5B960711.png" style="width: 6.5in; height: 0.5457in;" /></p>
++<p><img alt="10000000000002B30000003A5B960711_png" src="../../_images/10000000000002B30000003A5B960711.png" style="width: 6.5in; height: 0.5457in;" /></p>
+<p>However, viewing the same file via the browser, the actual contents of the file are displayed.</p>
- <p><img alt="10000000000001A40000006C954442CE_png" src="../_images/10000000000001A40000006C954442CE.png" style="width: 4.3752in; height: 1.1252in;" /></p>
++<p><img alt="10000000000001A40000006C954442CE_png" src="../../_images/10000000000001A40000006C954442CE.png" style="width: 4.3752in; height: 1.1252in;" /></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_encryption/Introduction.html
index 269268d,0000000..5f3a996
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/Introduction.html
+++ b/core/doc/admin/apps/files_encryption/Introduction.html
@@@ -1,169 -1,0 +1,169 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud contains an encryption app which, when enabled, encrypts all files stored in ownCloud.
+The encryption is done automatically once the admin enables the app.
+All encryption and decryption occur on the ownCloud server, which allows the user to continue to use other apps to view and edit the data.</p>
+<p>The user’s password is used as the key to decrypt their data.
+This means that if the user loses their login password, data will be lost.
+To protect against password loss, the recovery key may be used as described in a later section.</p>
+<div class="section" id="what-gets-encrypted">
+<h2>What gets encrypted?<a class="headerlink" href="#what-gets-encrypted" title="Permalink to this headline">¶</a></h2>
+<p>All files stored in ownCloud will be encrypted with the following exceptions:</p>
+<ul class="simple">
+<li>Old versions (versions created prior to enabling the encryption app)</li>
+<li>Old files in the trash bin (files deleted prior to enabling the encryption app)</li>
+<li>Existing files on external storage.
+Only new files placed on the external storage mount after encryption was enabled are encrypted.</li>
+<li>Image thumbnails from the gallery app</li>
+<li>Search index form the full text search app.</li>
+</ul>
+</div>
+<div class="section" id="decrypting-the-data">
+<h2>Decrypting the data<a class="headerlink" href="#decrypting-the-data" title="Permalink to this headline">¶</a></h2>
+<p>If the encryption app is disable, users will get the following message alerting them how to decrypt their files.</p>
- <p><img alt="100000000000023B000000125381F51B_png" src="../_images/100000000000023B000000125381F51B.png" style="width: 5.948in; height: 0.1874in;" /></p>
++<p><img alt="100000000000023B000000125381F51B_png" src="../../_images/100000000000023B000000125381F51B.png" style="width: 5.948in; height: 0.1874in;" /></p>
+<p>Navigating to the Personal settings page, the user can enter their password and decrypt all files.</p>
- <p><img alt="100000000000018B000000A090F31164_png" src="../_images/100000000000018B000000A090F31164.png" style="width: 4.1146in; height: 1.6665in;" /></p>
++<p><img alt="100000000000018B000000A090F31164_png" src="../../_images/100000000000018B000000A090F31164.png" style="width: 4.1146in; height: 1.6665in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_encryption/Table_of_Contents.html
index f71de11,0000000..681442e
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/Table_of_Contents.html
+++ b/core/doc/admin/apps/files_encryption/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374961923>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_encryption/index.html
index 5811c85,0000000..58c088a
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_encryption/index.html
+++ b/core/doc/admin/apps/files_encryption/index.html
@@@ -1,157 -1,0 +1,157 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Enctryption</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#what-gets-encrypted">What gets encrypted?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#decrypting-the-data">Decrypting the data</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#recovery-key">Recovery Key</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="File_Systems.html">File Systems</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_external/Configuration.html
index 1236ca6,0000000..5d3a4d9
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_external/Configuration.html
+++ b/core/doc/admin/apps/files_external/Configuration.html
@@@ -1,494 -1,0 +1,494 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="enable-the-app">
+<h2>Enable the app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h2>
+<p>From the
+APPs
+Page within ownCloud, select
+External Storage Support
+and enable.</p>
- <p><img alt="10000000000001980000009271BE0D26_png" src="../_images/10000000000001980000009271BE0D26.png" style="width: 4.25in; height: 1.5201in;" /></p>
++<p><img alt="10000000000001980000009271BE0D26_png" src="../../_images/10000000000001980000009271BE0D26.png" style="width: 4.25in; height: 1.5201in;" /></p>
+</div>
+<div class="section" id="configure-mounts">
+<h2>Configure mounts<a class="headerlink" href="#configure-mounts" title="Permalink to this headline">¶</a></h2>
+<p>As stated previously, the Admin has the ability to configure these mounts, as well as decide whether an end user can configure mounts for themselves.
+For the Admin, the configuration is performed in the
+ADMIN page.
+For end users, the configuration is performed in the PERSONAL Page.
+This document will discuss how the Admin configures the mounts, however, the configuration is the same for the end user.</p>
+<p>On the ADMIN page, scroll to External Storage:</p>
- <p><img alt="1000000000000631000000E19D116AA0_png" src="../_images/1000000000000631000000E19D116AA0.png" style="width: 6.5in; height: 0.9228in;" /></p>
++<p><img alt="1000000000000631000000E19D116AA0_png" src="../../_images/1000000000000631000000E19D116AA0.png" style="width: 6.5in; height: 0.9228in;" /></p>
+<div class="section" id="enable-users-to-mount-their-own-devices">
+<h3>Enable users to mount their own devices<a class="headerlink" href="#enable-users-to-mount-their-own-devices" title="Permalink to this headline">¶</a></h3>
+<p>In order to allow end users to mount their own devices, select the radio button next to
+Enable User External Storage
+.</p>
+</div>
+<div class="section" id="local-storage">
+<h3>Local Storage<a class="headerlink" href="#local-storage" title="Permalink to this headline">¶</a></h3>
+<p>This is used to mount storage that is outside ownCloud’s data directory</p>
- <p><img alt="10000000000006060000006A0106CA0C_png" src="../_images/10000000000006060000006A0106CA0C.png" style="width: 6.5in; height: 0.4465in;" /></p>
++<p><img alt="10000000000006060000006A0106CA0C_png" src="../../_images/10000000000006060000006A0106CA0C.png" style="width: 6.5in; height: 0.4465in;" /></p>
+<ul class="simple">
+<li>Location – The
+directory to mount</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000003DF00000071A41D8A1F_png" src="../_images/10000000000003DF00000071A41D8A1F.png" style="width: 6.5in; height: 0.7409in;" /></p>
++<p><img alt="10000000000003DF00000071A41D8A1F_png" src="../../_images/10000000000003DF00000071A41D8A1F.png" style="width: 6.5in; height: 0.7409in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="10000000000004770000008AAF3CFFDB_png" src="../_images/10000000000004770000008AAF3CFFDB.png" style="width: 6.5in; height: 0.7846in;" /></p>
++<p><img alt="10000000000004770000008AAF3CFFDB_png" src="../../_images/10000000000004770000008AAF3CFFDB.png" style="width: 6.5in; height: 0.7846in;" /></p>
+</div>
+<div class="section" id="amazon-s3">
+<h3>Amazon S3<a class="headerlink" href="#amazon-s3" title="Permalink to this headline">¶</a></h3>
+<p>This is used to mount to an S3 server</p>
- <p><img alt="100000000000061D0000007047877972_png" src="../_images/100000000000061D0000007047877972.png" style="width: 6.5in; height: 0.4654in;" /></p>
++<p><img alt="100000000000061D0000007047877972_png" src="../../_images/100000000000061D0000007047877972.png" style="width: 6.5in; height: 0.4654in;" /></p>
+<ul class="simple">
+<li>Access Key – The access key provided by the S3 storage provider</li>
+<li>Secret Key – The secret key provided by the S3 storage provider</li>
+<li>Bucket – The bucket created within the S3 storage server</li>
+<li>Hostname (optional) – The host of the s3 storage server</li>
+<li>Port (optional) – The port to communicate to the host on</li>
+<li>Region (optional) – The region where the storage exists</li>
+<li>Applicable – A list of users who can see this mount</li>
+</ul>
- <p><img alt="10000000000005BB0000007C1DF71FA7_png" src="../_images/10000000000005BB0000007C1DF71FA7.png" style="width: 6.5in; height: 0.5492in;" /></p>
++<p><img alt="10000000000005BB0000007C1DF71FA7_png" src="../../_images/10000000000005BB0000007C1DF71FA7.png" style="width: 6.5in; height: 0.5492in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="100000000000063F00000090AAE1FA4A_png" src="../_images/100000000000063F00000090AAE1FA4A.png" style="width: 6.5in; height: 0.5846in;" /></p>
++<p><img alt="100000000000063F00000090AAE1FA4A_png" src="../../_images/100000000000063F00000090AAE1FA4A.png" style="width: 6.5in; height: 0.5846in;" /></p>
+</div>
+<div class="section" id="dropbox">
+<h3>Dropbox<a class="headerlink" href="#dropbox" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a dropbox in the Dropbox cloud into the virtual file system.</p>
+<div class="section" id="configure-dropbox">
+<h4>Configure DropBox<a class="headerlink" href="#configure-dropbox" title="Permalink to this headline">¶</a></h4>
+<p>Log onto the Dropbox Developers page:
+<a class="reference external" href="http://www.dropbox.com/developers">http://www.dropbox.com/developers</a>
+.</p>
+<p>Select App Console:</p>
- <p><img alt="10000000000000A800000073F49785A6_png" src="../_images/10000000000000A800000073F49785A6.png" style="width: 1.75in; height: 1.198in;" /></p>
++<p><img alt="10000000000000A800000073F49785A6_png" src="../../_images/10000000000000A800000073F49785A6.png" style="width: 1.75in; height: 1.198in;" /></p>
+<p>This will ask you to accept terms and conditions.</p>
+<p>Select Dropbox API and configure down the page as follows:</p>
- <p><img alt="1000000000000372000002AF943ADDA0_png" src="../_images/1000000000000372000002AF943ADDA0.png" style="width: 6.5in; height: 5.0634in;" /></p>
++<p><img alt="1000000000000372000002AF943ADDA0_png" src="../../_images/1000000000000372000002AF943ADDA0.png" style="width: 6.5in; height: 5.0634in;" /></p>
+<p>The name can be any unique name desired.</p>
+<p>Select Create App</p>
- <p><img alt="10000000000000950000004412998BE7_png" src="../_images/10000000000000950000004412998BE7.png" style="width: 1.552in; height: 0.7083in;" /></p>
++<p><img alt="10000000000000950000004412998BE7_png" src="../../_images/10000000000000950000004412998BE7.png" style="width: 1.552in; height: 0.7083in;" /></p>
+<p>Enter the OAuth redirect URI as follows:</p>
+<p><a class="reference external" href="http:/">http:/</a>/<ownCloud instance>/index.php/settings/personal</p>
+<p><a class="reference external" href="http:/">http:/</a>/<ownCloud instance>/index.php/settings/admin</p>
- <p><img alt="10000000000003A6000002A9C7A660BE_png" src="../_images/10000000000003A6000002A9C7A660BE.png" style="width: 6.5in; height: 4.7398in;" /></p>
++<p><img alt="10000000000003A6000002A9C7A660BE_png" src="../../_images/10000000000003A6000002A9C7A660BE.png" style="width: 6.5in; height: 4.7398in;" /></p>
+<p>Take note of the App Key and App Secret and enter into ownCloud.</p>
+</div>
+<div class="section" id="owncloud-configuration">
+<h4>ownCloud Configuration<a class="headerlink" href="#owncloud-configuration" title="Permalink to this headline">¶</a></h4>
- <p><img alt="100000000000060300000065DF96536B_png" src="../_images/100000000000060300000065DF96536B.png" style="width: 6.5in; height: 0.4264in;" /></p>
++<p><img alt="100000000000060300000065DF96536B_png" src="../../_images/100000000000060300000065DF96536B.png" style="width: 6.5in; height: 0.4264in;" /></p>
+<ul class="simple">
+<li>App key – The app key to login to your Dropbox</li>
+<li>App secret – The app secret to login to your Dropbox</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000005EC00000073E678DFEC_png" src="../_images/10000000000005EC00000073E678DFEC.png" style="width: 6.5in; height: 0.4929in;" /></p>
++<p><img alt="10000000000005EC00000073E678DFEC_png" src="../../_images/10000000000005EC00000073E678DFEC.png" style="width: 6.5in; height: 0.4929in;" /></p>
+<p>Select “Grant Access” and the following appears</p>
- <p><img alt="10000000000002950000021E245F6883_png" src="../_images/10000000000002950000021E245F6883.png" style="width: 6.5in; height: 5.3299in;" /></p>
++<p><img alt="10000000000002950000021E245F6883_png" src="../../_images/10000000000002950000021E245F6883.png" style="width: 6.5in; height: 5.3299in;" /></p>
+<p>Note if you are not logged into Dropbox, you will first be prompted to login.</p>
+<p>Select Allow.</p>
- <p><img alt="10000000000005E6000000676902E040_png" src="../_images/10000000000005E6000000676902E040.png" style="width: 6.5in; height: 0.4429in;" /></p>
++<p><img alt="10000000000005E6000000676902E040_png" src="../../_images/10000000000005E6000000676902E040.png" style="width: 6.5in; height: 0.4429in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="100000000000061A0000006FC014C3A4_png" src="../_images/100000000000061A0000006FC014C3A4.png" style="width: 6.5in; height: 0.461in;" /></p>
++<p><img alt="100000000000061A0000006FC014C3A4_png" src="../../_images/100000000000061A0000006FC014C3A4.png" style="width: 6.5in; height: 0.461in;" /></p>
+</div>
+</div>
+<div class="section" id="ftp">
+<h3>FTP<a class="headerlink" href="#ftp" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a folder on a remote FTP or FTPS server</p>
- <p><img alt="100000000000061E0000006BCF9ECC0B_png" src="../_images/100000000000061E0000006BCF9ECC0B.png" style="width: 6.5in; height: 0.4437in;" /></p>
++<p><img alt="100000000000061E0000006BCF9ECC0B_png" src="../../_images/100000000000061E0000006BCF9ECC0B.png" style="width: 6.5in; height: 0.4437in;" /></p>
+<ul class="simple">
+<li>URL – The hostname of the FTP/FTPS server</li>
+<li>Username – The username to login to the FTP/FTPS server</li>
+<li>Password – The password to login to the FTP/FTPS esrver</li>
+<li>Root – The folder inside the FTP/FTPS server to mount (optional – defaults to ‘/’)</li>
+<li>Secure ftps:// – Whether to use ftps:// to connect to the FTP server instead of ftp://</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000005AF00000074604B1A67_png" src="../_images/10000000000005AF00000074604B1A67.png" style="width: 6.5in; height: 0.5181in;" /></p>
++<p><img alt="10000000000005AF00000074604B1A67_png" src="../../_images/10000000000005AF00000074604B1A67.png" style="width: 6.5in; height: 0.5181in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="10000000000005D50000009458C5EE48_png" src="../_images/10000000000005D50000009458C5EE48.png" style="width: 6.5in; height: 0.6437in;" /></p>
++<p><img alt="10000000000005D50000009458C5EE48_png" src="../../_images/10000000000005D50000009458C5EE48.png" style="width: 6.5in; height: 0.6437in;" /></p>
+</div>
+<div class="section" id="googledrive">
+<h3>GoogleDrive<a class="headerlink" href="#googledrive" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a share in the Google cloud.</p>
+<div class="section" id="configure-googledrive">
+<h4>Configure GoogleDrive<a class="headerlink" href="#configure-googledrive" title="Permalink to this headline">¶</a></h4>
+<p>All applications that access a Google API must be registered through the “Google Cloud Console”.
+This can be accessed at the following URL:</p>
+<p><a class="reference external" href="https://cloud.google.com">https://cloud.google.com</a></p>
+<p>Once logged into Google, create a project by selecting
+Create Project</p>
- <p><img alt="1000000000000247000000A77440E4D3_png" src="../_images/1000000000000247000000A77440E4D3.png" style="width: 6.0728in; height: 1.7398in;" /></p>
++<p><img alt="1000000000000247000000A77440E4D3_png" src="../../_images/1000000000000247000000A77440E4D3.png" style="width: 6.0728in; height: 1.7398in;" /></p>
+<p>Enter a
+Project name
+and either keep or enter a new
+Project ID</p>
- <p><img alt="100000000000027B0000011D10F70F88_png" src="../_images/100000000000027B0000011D10F70F88.png" style="width: 6.5in; height: 2.9173in;" /></p>
++<p><img alt="100000000000027B0000011D10F70F88_png" src="../../_images/100000000000027B0000011D10F70F88.png" style="width: 6.5in; height: 2.9173in;" /></p>
+<p>Select the project and choose the
+APIs & auth
+menu entry</p>
- <p><img alt="10000000000000B600000120706C3C75_png" src="../_images/10000000000000B600000120706C3C75.png" style="width: 1.8957in; height: 3in;" /></p>
++<p><img alt="10000000000000B600000120706C3C75_png" src="../../_images/10000000000000B600000120706C3C75.png" style="width: 1.8957in; height: 3in;" /></p>
+<p>Enable
+Drive API
+and
+Drive SDK
+and then select the
- <img alt="100000000000003800000018D49F1CE7_png" src="../_images/100000000000003800000018D49F1CE7.png" style="width: 0.5835in; height: 0.25in;" />
++<img alt="100000000000003800000018D49F1CE7_png" src="../../_images/100000000000003800000018D49F1CE7.png" style="width: 0.5835in; height: 0.25in;" />
+next to either
+Drive API
+or
+Drive SDK</p>
- <p><img alt="10000000000004100000005657010336_png" src="../_images/10000000000004100000005657010336.png" style="width: 6.5in; height: 0.5374in;" /></p>
++<p><img alt="10000000000004100000005657010336_png" src="../../_images/10000000000004100000005657010336.png" style="width: 6.5in; height: 0.5374in;" /></p>
+<p>Select
+API Access
+on the menu</p>
- <p><img alt="10000000000000CD000000ECA8DE7780_png" src="../_images/10000000000000CD000000ECA8DE7780.png" style="width: 2.1346in; height: 2.4583in;" /></p>
++<p><img alt="10000000000000CD000000ECA8DE7780_png" src="../../_images/10000000000000CD000000ECA8DE7780.png" style="width: 2.1346in; height: 2.4583in;" /></p>
+<p>Select
+REGISTER APP</p>
- <p><img alt="10000000000001FD000000DF8D2D7546_png" src="../_images/10000000000001FD000000DF8D2D7546.png" style="width: 5.302in; height: 2.3228in;" /></p>
++<p><img alt="10000000000001FD000000DF8D2D7546_png" src="../../_images/10000000000001FD000000DF8D2D7546.png" style="width: 5.302in; height: 2.3228in;" /></p>
+<p>Enter a name and select
+Web Application</p>
- <p><img alt="10000000000002840000016729388B7F_png" src="../_images/10000000000002840000016729388B7F.png" style="width: 6.5in; height: 3.6228in;" /></p>
++<p><img alt="10000000000002840000016729388B7F_png" src="../../_images/10000000000002840000016729388B7F.png" style="width: 6.5in; height: 3.6228in;" /></p>
+<p>Expand
+OAuth 2.0 Client ID</p>
+<p>Enter the following in the
+REDIRECT URI
+field</p>
+<p><a class="reference external" href="http:/">http:/</a>/<ownCloud instance>/index.php/settings/personal</p>
+<p><a class="reference external" href="http:/">http:/</a>/<ownCloud instance>/index.php/settings/admin</p>
+<p>Note: The
+<ownCloud instance>
+must be a Fully Qualified Domain Name.
+It cannot be an IP address</p>
+<p>Select
+Generate</p>
- <p><img alt="10000000000003B30000021B5EE5D338_png" src="../_images/10000000000003B30000021B5EE5D338.png" style="width: 6.5in; height: 3.6992in;" /></p>
++<p><img alt="10000000000003B30000021B5EE5D338_png" src="../../_images/10000000000003B30000021B5EE5D338.png" style="width: 6.5in; height: 3.6992in;" /></p>
+<p>Verify that the required email addresses are in the
+Permissions
+tab</p>
- <p><img alt="10000000000003A60000011E274A1A28_png" src="../_images/10000000000003A60000011E274A1A28.png" style="width: 6.5in; height: 1.9902in;" /></p>
++<p><img alt="10000000000003A60000011E274A1A28_png" src="../../_images/10000000000003A60000011E274A1A28.png" style="width: 6.5in; height: 1.9902in;" /></p>
+</div>
+<div class="section" id="configure-owncloud">
+<h4>Configure ownCloud<a class="headerlink" href="#configure-owncloud" title="Permalink to this headline">¶</a></h4>
+<p>Prior to configuring the mount, an E-mail address needs to be configured in the
+Personal
+tab</p>
- <p><img alt="10000000000001880000007EA4444400_png" src="../_images/10000000000001880000007EA4444400.png" style="width: 4.0835in; height: 1.3126in;" /></p>
- <p><img alt="10000000000006000000005EDA7B96BE_png" src="../_images/10000000000006000000005EDA7B96BE.png" style="width: 6.5in; height: 0.398in;" /></p>
++<p><img alt="10000000000001880000007EA4444400_png" src="../../_images/10000000000001880000007EA4444400.png" style="width: 4.0835in; height: 1.3126in;" /></p>
++<p><img alt="10000000000006000000005EDA7B96BE_png" src="../../_images/10000000000006000000005EDA7B96BE.png" style="width: 6.5in; height: 0.398in;" /></p>
+<ul class="simple">
+<li>Client ID – The client id to login to the Google Drive from
+OAuth 2.0 Client ID
+above</li>
+<li>Client secret – The client secret to login to the Google Drive from
+OAuth 2.0 Client ID
+above</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
+<p>Once the required fields are filled in, a
+Grant access
+button appears.
+Select this button</p>
- <p><img alt="10000000000005F70000007E43DB8026_png" src="../_images/10000000000005F70000007E43DB8026.png" style="width: 6.5in; height: 0.5362in;" /></p>
++<p><img alt="10000000000005F70000007E43DB8026_png" src="../../_images/10000000000005F70000007E43DB8026.png" style="width: 6.5in; height: 0.5362in;" /></p>
+<p>The following screen appears.
+Select
+Accept</p>
- <p><img alt="10000000000001D30000014DC251C948_png" src="../_images/10000000000001D30000014DC251C948.png" style="width: 4.8646in; height: 3.4689in;" /></p>
- <p><img alt="10000000000004C0000000795BB2C146_png" src="../_images/10000000000004C0000000795BB2C146.png" style="width: 6.5in; height: 0.6465in;" /></p>
- <p><img alt="1000000000000552000000BF22E90239_png" src="../_images/1000000000000552000000BF22E90239.png" style="width: 6.5in; height: 0.911in;" /></p>
++<p><img alt="10000000000001D30000014DC251C948_png" src="../../_images/10000000000001D30000014DC251C948.png" style="width: 4.8646in; height: 3.4689in;" /></p>
++<p><img alt="10000000000004C0000000795BB2C146_png" src="../../_images/10000000000004C0000000795BB2C146.png" style="width: 6.5in; height: 0.6465in;" /></p>
++<p><img alt="1000000000000552000000BF22E90239_png" src="../../_images/1000000000000552000000BF22E90239.png" style="width: 6.5in; height: 0.911in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
+</div>
+</div>
+<div class="section" id="openstack-object-storage">
+<h3>OpenStack Object Storage<a class="headerlink" href="#openstack-object-storage" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a container on an OpenStack Object Storage server.</p>
- <p><img alt="100000000000053A00000067708C8F53_png" src="../_images/100000000000053A00000067708C8F53.png" style="width: 6.5in; height: 0.5008in;" /></p>
- <p><img alt="10000000000002170000004A27056037_png" src="../_images/10000000000002170000004A27056037.png" style="width: 5.5728in; height: 0.7701in;" /></p>
++<p><img alt="100000000000053A00000067708C8F53_png" src="../../_images/100000000000053A00000067708C8F53.png" style="width: 6.5in; height: 0.5008in;" /></p>
++<p><img alt="10000000000002170000004A27056037_png" src="../../_images/10000000000002170000004A27056037.png" style="width: 5.5728in; height: 0.7701in;" /></p>
+<ul class="simple">
+<li>Username</li>
+<li>Bucket</li>
+<li>Region</li>
+<li>API Key</li>
+<li>Tenantname</li>
+<li>Password</li>
+<li>Service Name</li>
+<li>URL of identity Endpoint</li>
+<li>Timeout of HTTP request</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
+</div>
+<div class="section" id="smb-cifs">
+<h3>SMB/CIFS<a class="headerlink" href="#smb-cifs" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a folder on a remote Samba server, NAS appliance, or Windows machine.</p>
- <p><img alt="10000000000005FA0000005CE8491B77_png" src="../_images/10000000000005FA0000005CE8491B77.png" style="width: 6.5in; height: 0.3909in;" /></p>
++<p><img alt="10000000000005FA0000005CE8491B77_png" src="../../_images/10000000000005FA0000005CE8491B77.png" style="width: 6.5in; height: 0.3909in;" /></p>
+<ul class="simple">
+<li>URL – The host name of the Samba server.</li>
+<li>Username – The user name used to login to the Samba server.</li>
+<li>Password – The password to login to the Samba server.</li>
+<li>Share – The share on the Samba server to mount.</li>
+<li>Root – The folder inside the Samba share to mount (optional, defaults to ‘/’)</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000005C30000006CAFFAAD61_png" src="../_images/10000000000005C30000006CAFFAAD61.png" style="width: 6.5in; height: 0.4756in;" /></p>
++<p><img alt="10000000000005C30000006CAFFAAD61_png" src="../../_images/10000000000005C30000006CAFFAAD61.png" style="width: 6.5in; height: 0.4756in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
+<p>Note: The SMB backend requires smbclient to be installed on the server</p>
- <p><img alt="10000000000005D00000003B29340A7A_png" src="../_images/10000000000005D00000003B29340A7A.png" style="width: 6.5in; height: 0.2575in;" /></p>
++<p><img alt="10000000000005D00000003B29340A7A_png" src="../../_images/10000000000005D00000003B29340A7A.png" style="width: 6.5in; height: 0.2575in;" /></p>
+</div>
+<div class="section" id="owncloud-webdav">
+<h3>ownCloud/WebDAV<a class="headerlink" href="#owncloud-webdav" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a folder on a WebDAV server (or another ownCloud instance via WebDAV).</p>
- <p><img alt="10000000000005F70000005F0912E904_png" src="../_images/10000000000005F70000005F0912E904.png" style="width: 6.5in; height: 0.4043in;" /></p>
++<p><img alt="10000000000005F70000005F0912E904_png" src="../../_images/10000000000005F70000005F0912E904.png" style="width: 6.5in; height: 0.4043in;" /></p>
+<ul class="simple">
+<li>URL – The hostname of the WebDAV server.</li>
+<li>Username – The username used to login to the WebDAV server.</li>
+<li>Password – The password used to login to the WebDAV server.</li>
+<li>Root – The folder inside the WebDav server to mount (optional, defaults to ‘/’)</li>
+<li>Secure <a class="reference external" href="https://">https://</a> - Whether to use <a class="reference external" href="https://">https://</a> to connect to the WebDav server instead of <a class="reference external" href="http://">http://</a></li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000005B90000007866D92D14_png" src="../_images/10000000000005B90000007866D92D14.png" style="width: 6.5in; height: 0.5319in;" /></p>
++<p><img alt="10000000000005B90000007866D92D14_png" src="../../_images/10000000000005B90000007866D92D14.png" style="width: 6.5in; height: 0.5319in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="10000000000005E20000009B1BA5A8CF_png" src="../_images/10000000000005E20000009B1BA5A8CF.png" style="width: 6.5in; height: 0.6689in;" /></p>
++<p><img alt="10000000000005E20000009B1BA5A8CF_png" src="../../_images/10000000000005E20000009B1BA5A8CF.png" style="width: 6.5in; height: 0.6689in;" /></p>
+</div>
+<div class="section" id="sftp">
+<h3>SFTP<a class="headerlink" href="#sftp" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a folder on a remote SSH server.</p>
- <p><img alt="10000000000005FF0000005F35710398_png" src="../_images/10000000000005FF0000005F35710398.png" style="width: 6.5in; height: 0.402in;" /></p>
++<p><img alt="10000000000005FF0000005F35710398_png" src="../../_images/10000000000005FF0000005F35710398.png" style="width: 6.5in; height: 0.402in;" /></p>
+<ul class="simple">
+<li>URL – The hostname of the SSH server.</li>
+<li>Username – The username used to login to the SSH server.</li>
+<li>Password – The password used to login to the SSH server.</li>
+<li>Root – The folder inside the SSH server to mount (optional, defaults to ‘/’)</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
- <p><img alt="10000000000005970000006AE23997C9_png" src="../_images/10000000000005970000006AE23997C9.png" style="width: 6.5in; height: 0.4811in;" /></p>
++<p><img alt="10000000000005970000006AE23997C9_png" src="../../_images/10000000000005970000006AE23997C9.png" style="width: 6.5in; height: 0.4811in;" /></p>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
- <p><img alt="10000000000005EB000000A68BA73E2D_png" src="../_images/10000000000005EB000000A68BA73E2D.png" style="width: 6.5in; height: 0.7126in;" /></p>
++<p><img alt="10000000000005EB000000A68BA73E2D_png" src="../../_images/10000000000005EB000000A68BA73E2D.png" style="width: 6.5in; height: 0.7126in;" /></p>
+</div>
+<div class="section" id="irods">
+<h3>iRODS<a class="headerlink" href="#irods" title="Permalink to this headline">¶</a></h3>
+<p>Mounts a folder on a iRODS server.</p>
- <p><img alt="100000000000062A0000005F61A18950_png" src="../_images/100000000000062A0000005F61A18950.png" style="width: 6.5in; height: 0.3909in;" /></p>
++<p><img alt="100000000000062A0000005F61A18950_png" src="../../_images/100000000000062A0000005F61A18950.png" style="width: 6.5in; height: 0.3909in;" /></p>
+<ul class="simple">
+<li>Host</li>
+<li>Port</li>
+<li>Use ownCloud login</li>
+<li>Username</li>
+<li>Password</li>
+<li>Authentication Mode</li>
+<li>Zone</li>
+<li>Applicable – A list users of who can see this mount</li>
+</ul>
+<p>Note: When configured correctly, a
+Green Light
+will appear next to the Folder Name.
+If misconfigured, a
+Red Light
+will appear.</p>
+</div>
+</div>
+<div class="section" id="configuration-file">
+<h2>Configuration File<a class="headerlink" href="#configuration-file" title="Permalink to this headline">¶</a></h2>
+<p>The configuration of mounts created within the External Storage App are stored in the
+data/mount.json
+file.
+This file contains all settings in JSON (JavaScript Object Notation) format.
+Two different types of entries exist:</p>
+<ul class="simple">
+<li>Group mounts -
+Each entry configures a mount for each user in group</li>
+<li>User mount – Each entry configures a mount for a single user or all users.</li>
+</ul>
+<p>For each type, there is a JSON array with the user/group name as key and an array of configuration values as the value.
+Each entry consist of the class name of the storage backend and an array of backend specific options (described above) and will be replaced by the user login.</p>
+<p>Although configuration may be done by making modifications to the mount.json file, it is recommended to use the Web-GUI in the administrator panel (as described in the above section) to add, remove, or modify mount options in order to prevent any problems.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_external/Introduction.html
index 3571cb1,0000000..5c0e74f
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_external/Introduction.html
+++ b/core/doc/admin/apps/files_external/Introduction.html
@@@ -1,165 -1,0 +1,165 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud provides the ability to mount an external storage device.
+The external storage devices serves as a secondary storage device within ownCloud.</p>
+<p>The ownCloud Admin has the ability to create such a mount.
+In addition, the ownCloud Admin may decide to provide the end user the ability to create the mount.
+The mounts may be created on a per-user, per group, or all user basis.</p>
+<div class="section" id="supported-mounts">
+<h2>Supported mounts<a class="headerlink" href="#supported-mounts" title="Permalink to this headline">¶</a></h2>
+<p>The following lists the supported storage types.</p>
+<ul class="simple">
+<li>Local</li>
+<li>Amazon S3</li>
+<li>Dropbox</li>
+<li>FTP</li>
+<li>Google Drive</li>
+<li>OpenStack Object Storage</li>
+<li>SMB/CIFS</li>
+<li>ownCloud/WebDAV</li>
+<li>SFTP</li>
+<li>iRODS</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_external/Table_of_Contents.html
index 0c7a478,0000000..c9e348a
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_external/Table_of_Contents.html
+++ b/core/doc/admin/apps/files_external/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <<a class="reference external" href="file:///C:/Users/ser72/Desktop/S3_parent/Support/DOCUMENTS/Community/HYPERLINK#_Toc374110003">file:///C:/Users/ser72/Desktop/S3_parent/Support/DOCUMENTS/Community/HYPERLINK#_Toc374110003</a>>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_external/index.html
index b6580a8,0000000..59cb0f3
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_external/index.html
+++ b/core/doc/admin/apps/files_external/index.html
@@@ -1,157 -1,0 +1,157 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>External Storage Mounts</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#supported-mounts">Supported mounts</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#enable-the-app">Enable the app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#configure-mounts">Configure mounts</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#configuration-file">Configuration File</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/Configuration.html
index e3c0d80,0000000..9d7b354
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/Configuration.html
+++ b/core/doc/admin/apps/files_sharing/Configuration.html
@@@ -1,157 -1,0 +1,157 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="enable-the-app">
+<h2>Enable the app<a class="headerlink" href="#enable-the-app" title="Permalink to this headline">¶</a></h2>
+<p>The Share Files app is enabled by default.
+To verify this and/or disable this functionality, navigate to the APPS page in the web interface and select “Share Files”</p>
- <p><img alt="1000000000000167000000B43E4BF478_png" src="../_images/1000000000000167000000B43E4BF478.png" style="width: 3.7398in; height: 1.8752in;" /></p>
++<p><img alt="1000000000000167000000B43E4BF478_png" src="../../_images/1000000000000167000000B43E4BF478.png" style="width: 3.7398in; height: 1.8752in;" /></p>
+</div>
+<div class="section" id="configuring-the-permitted-functionality">
+<h2>Configuring the permitted functionality<a class="headerlink" href="#configuring-the-permitted-functionality" title="Permalink to this headline">¶</a></h2>
+<p>There are several functions which may be enabled or disabled at the admin’s discretion.
+To configure these functions, navigate to the Admin page in the web interface and scroll to the “Sharing” section.</p>
- <p><img alt="10000000000001CF00000176B0BE1EBC_png" src="../_images/10000000000001CF00000176B0BE1EBC.png" style="width: 4.8228in; height: 3.8957in;" /></p>
++<p><img alt="10000000000001CF00000176B0BE1EBC_png" src="../../_images/10000000000001CF00000176B0BE1EBC.png" style="width: 4.8228in; height: 3.8957in;" /></p>
+<p>The above parameters are self-explanatory and may be enabled or disabled as required.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/Introduction.html
index 5388849,0000000..896435f
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/Introduction.html
+++ b/core/doc/admin/apps/files_sharing/Introduction.html
@@@ -1,148 -1,0 +1,148 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud allows users to share files and folders with both other ownCloud users, as well as publicly via a link.
+Sharing may be done either via the web interface or via the Sharing API.
+This document will discuss the web interface and sharing.
+For information on the Sharing API, please refer to that document.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/Retrieving_shared_data.html
index 84b1cea,0000000..99d01a8
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/Retrieving_shared_data.html
+++ b/core/doc/admin/apps/files_sharing/Retrieving_shared_data.html
@@@ -1,159 -1,0 +1,159 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Retrieving shared data — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="retrieving-shared-data">
+<h1>Retrieving shared data<a class="headerlink" href="#retrieving-shared-data" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="user-group-shares">
+<h2>User/group shares<a class="headerlink" href="#user-group-shares" title="Permalink to this headline">¶</a></h2>
+<p>When the shared with user logs into their ownCloud instance they will see a “Shared” folder.</p>
- <p><img alt="100000000000046C000000C2D3E5CF30_png" src="../_images/100000000000046C000000C2D3E5CF30.png" style="width: 6.5in; height: 1.1138in;" /></p>
++<p><img alt="100000000000046C000000C2D3E5CF30_png" src="../../_images/100000000000046C000000C2D3E5CF30.png" style="width: 6.5in; height: 1.1138in;" /></p>
+<p>Within that Shared folder are all files and folders which have been shared to that user by any other ownCloud user.</p>
- <p><img alt="1000000000000462000000D44541CF9A_png" src="../_images/1000000000000462000000D44541CF9A.png" style="width: 6.5in; height: 1.2283in;" /></p>
++<p><img alt="1000000000000462000000D44541CF9A_png" src="../../_images/1000000000000462000000D44541CF9A.png" style="width: 6.5in; height: 1.2283in;" /></p>
+</div>
+<div class="section" id="share-as-link">
+<h2>Share as link<a class="headerlink" href="#share-as-link" title="Permalink to this headline">¶</a></h2>
+<p>To view a file/folder which was shared as a link, simply enter the link into the browser.</p>
- <p><img alt="10000000000004CA000002B52116BE0C_png" src="../_images/10000000000004CA000002B52116BE0C.png" style="width: 6.5in; height: 3.6744in;" /></p>
++<p><img alt="10000000000004CA000002B52116BE0C_png" src="../../_images/10000000000004CA000002B52116BE0C.png" style="width: 6.5in; height: 3.6744in;" /></p>
+<p>To download the file/folder select the Download button on the upper right of the page.
+If this link was password protected, the user will be prompted with a password prior to this page appearing.</p>
- <p><img alt="100000000000045800000197FE462F2B_png" src="../_images/100000000000045800000197FE462F2B.png" style="width: 6.5in; height: 2.3791in;" /></p>
++<p><img alt="100000000000045800000197FE462F2B_png" src="../../_images/100000000000045800000197FE462F2B.png" style="width: 6.5in; height: 2.3791in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/Table_of_Contents.html
index c3db146,0000000..5f12b11
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/Table_of_Contents.html
+++ b/core/doc/admin/apps/files_sharing/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc377716145>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/Utilization.html
index d89665b,0000000..9f0b959
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/Utilization.html
+++ b/core/doc/admin/apps/files_sharing/Utilization.html
@@@ -1,194 -1,0 +1,194 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>An ownCloud user may share files or entire folders with other individuals.
+The method of sharing is the same.</p>
+<div class="section" id="share-with-another-owncloud-user">
+<h2>Share with another ownCloud user<a class="headerlink" href="#share-with-another-owncloud-user" title="Permalink to this headline">¶</a></h2>
+<p>Hover over the line containing the file or folder to be shared.
+And then select Share.
+The following dialog appears.</p>
- <p><img alt="10000000000003EC000000AB60616FA7_png" src="../_images/10000000000003EC000000AB60616FA7.png" style="width: 6.5in; height: 1.1071in;" /></p>
++<p><img alt="10000000000003EC000000AB60616FA7_png" src="../../_images/10000000000003EC000000AB60616FA7.png" style="width: 6.5in; height: 1.1071in;" /></p>
+<p>In the “share with user or group” text box, enter the user to share with, or the group to share with.
+Note, as letters are typed, the users and groups who match the typed string will appear.
+As a short cut, simply select the desired user/group</p>
+</div>
+<div class="section" id="setting-permissions-on-the-share">
+<h2>Setting Permissions on the share<a class="headerlink" href="#setting-permissions-on-the-share" title="Permalink to this headline">¶</a></h2>
+<p>When a file or folder is shared, the permissions may be modified stating what the other user may do with the file/folder.
+Once the share with user or group has been entered, the dialog will expand as follows.</p>
- <p><img alt="1000000000000404000000FCFC13E732_png" src="../_images/1000000000000404000000FCFC13E732.png" style="width: 6.5in; height: 1.5929in;" /></p>
++<p><img alt="1000000000000404000000FCFC13E732_png" src="../../_images/1000000000000404000000FCFC13E732.png" style="width: 6.5in; height: 1.5929in;" /></p>
+<p>If the shared with user has an email address configured, the sharing user may choose to notify the shared with user of the share.
+To do this, select the checkbox next to “notify by email”.
+It is important to note, this checkbox appears whether or not the shared with user has email configured.</p>
+<p>When sharing a file/folder, it is obvious that the file may be viewed or downloaded.
+However, if the shared with user is allowed to modify the file in any way, the “can edit” box should be checked.
+The sharing user may allow the shared with user to update, delete, or re-share the file.
+Note, by default, all permissions are set.</p>
+<p>It should be noted that when sharing a folder, an additional permission, “create” is available.
+When enabled, the shared to users can create new files and folders within the shared folder.</p>
+</div>
+<div class="section" id="share-as-a-link">
+<h2>Share as a link<a class="headerlink" href="#share-as-a-link" title="Permalink to this headline">¶</a></h2>
+<p>In the event that an ownCloud user desires to share a file with a non-ownCloud user, the file may be shared as a link.
+To share as a link, hover over the line containing the file and select Share.
+Then select the check box next to “Share link”</p>
- <p><img alt="10000000000003E8000001524A147A04_png" src="../_images/10000000000003E8000001524A147A04.png" style="width: 6.5in; height: 2.1965in;" /></p>
++<p><img alt="10000000000003E8000001524A147A04_png" src="../../_images/10000000000003E8000001524A147A04.png" style="width: 6.5in; height: 2.1965in;" /></p>
+<p>The link is then shown in the text box.
+The link may be copied and pasted into an email and sent to the other user.
+Alternatively, if email is setup within ownCloud, the sharing user may input the shared with user’s email address in the text box and select send.
+The shared user will then receive an email from the ownCloud server with the link.</p>
+<p>There may be circumstances where the file owner wants some security on the link so it cannot be accessed by anyone other than the desired person.
+To do this, the link may be Password Protected by selecting the “Password Protect” checkbox and entering a desired password.</p>
- <p><img alt="1000000000000403000001632F0B76F6_png" src="../_images/1000000000000403000001632F0B76F6.png" style="width: 6.5in; height: 2.2465in;" /></p>
++<p><img alt="1000000000000403000001632F0B76F6_png" src="../../_images/1000000000000403000001632F0B76F6.png" style="width: 6.5in; height: 2.2465in;" /></p>
+</div>
+<div class="section" id="setting-expiration-date">
+<h2>Setting Expiration Date<a class="headerlink" href="#setting-expiration-date" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud allows the sharing user to expire a file or folder share at a given date.
+This expiration applies to all shares within the folder as well.
+So, if a user expires a folder share, all files within the folder will no longer be shared.</p>
+<p>To set an expiration, select the Set expiration date checkbox and then select the expiration date.
+(The calendar will appear when the mouse is clicked in the Expiration date text box.</p>
- <p><img alt="10000000000004010000017E4A6552BC_png" src="../_images/10000000000004010000017E4A6552BC.png" style="width: 6.5in; height: 2.422in;" /></p>
++<p><img alt="10000000000004010000017E4A6552BC_png" src="../../_images/10000000000004010000017E4A6552BC.png" style="width: 6.5in; height: 2.422in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_sharing/index.html
index 91cf8d6,0000000..ee56d2f
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_sharing/index.html
+++ b/core/doc/admin/apps/files_sharing/index.html
@@@ -1,165 -1,0 +1,165 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Sharing App</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#enable-the-app">Enable the app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#configuring-the-permitted-functionality">Configuring the permitted functionality</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#share-with-another-owncloud-user">Share with another ownCloud user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#setting-permissions-on-the-share">Setting Permissions on the share</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#share-as-a-link">Share as a link</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#setting-expiration-date">Setting Expiration Date</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Retrieving_shared_data.html">Retrieving shared data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Retrieving_shared_data.html#user-group-shares">User/group shares</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Retrieving_shared_data.html#share-as-link">Share as link</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_trashbin/Configuration_and_storage_.html
index a47fa88,0000000..f3ea3ee
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/Configuration_and_storage_.html
+++ b/core/doc/admin/apps/files_trashbin/Configuration_and_storage_.html
@@@ -1,159 -1,0 +1,159 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration and storage — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration-and-storage">
+<h1>Configuration and storage<a class="headerlink" href="#configuration-and-storage" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="configuration">
+<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
+<p>By default, the ownCloud deleted files app is enabled.
+To verify or disable, navigate to the apps
+page and select Deleted Files.</p>
- <p><img alt="100000000000042F000000CC3EDDE79E_png" src="../_images/100000000000042F000000CC3EDDE79E.png" style="width: 6.5in; height: 1.2382in;" /></p>
++<p><img alt="100000000000042F000000CC3EDDE79E_png" src="../../_images/100000000000042F000000CC3EDDE79E.png" style="width: 6.5in; height: 1.2382in;" /></p>
+</div>
+<div class="section" id="storage">
+<h2>Storage<a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h2>
+<p>Once a file has been deleted by the user, it is moved to the
+<em>~/data/<user>/files_trashbin/files</em></p>
+<p>folder.</p>
- <p><img alt="10000000000002B3000000365E1CD00D_png" src="../_images/10000000000002B3000000365E1CD00D.png" style="width: 6.5in; height: 0.5075in;" /></p>
++<p><img alt="10000000000002B3000000365E1CD00D_png" src="../../_images/10000000000002B3000000365E1CD00D.png" style="width: 6.5in; height: 0.5075in;" /></p>
+<p>The remaining directories retain information on encryption key files, and versions.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_trashbin/Introduction.html
index 32d7044,0000000..f3d3e03
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/Introduction.html
+++ b/core/doc/admin/apps/files_trashbin/Introduction.html
@@@ -1,163 -1,0 +1,163 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud server stores deleted files in a temporary area in the event that the file was inadvertently deleted and/or needs to be restored.</p>
+<div class="section" id="expiry-of-deleted-files">
+<h2>Expiry of deleted files<a class="headerlink" href="#expiry-of-deleted-files" title="Permalink to this headline">¶</a></h2>
+<p>There are two instances in which ownCloud will automatically permanently remove a deleted file.</p>
+<div class="section" id="disk-utilization">
+<h3>Disk Utilization<a class="headerlink" href="#disk-utilization" title="Permalink to this headline">¶</a></h3>
+<p>To prevent a user from running out of disk space, the ownCloud deleted files app will not utilize more than 50% of the currently available free space for deleted files.
+If the deleted files exceed this limit, ownCloud deletes the oldest files until it gets below this limit.</p>
+</div>
+<div class="section" id="age">
+<h3>Age<a class="headerlink" href="#age" title="Permalink to this headline">¶</a></h3>
+<p>By default, deleted files remain in the trash bin for 30 days.
+This can be configured using the trashbin_retention_obligation parameter
+in the config.php
+file.
+Files older than the configured value (or default 30 days) will be permanently deleted.
+ownCloud checks the age of the files each time a new file is moved to the deleted files bin.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_trashbin/Table_of_Contents.html
index 136c77d,0000000..3c4f1b5
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/Table_of_Contents.html
+++ b/core/doc/admin/apps/files_trashbin/Table_of_Contents.html
@@@ -1,147 -1,0 +1,147 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374622085>`_</p>
+<p>Reviewed</p>
+<p>Allen Gigler 12/5/2013</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_trashbin/Utilization.html
index 87b3dac,0000000..2d03e10
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/Utilization.html
+++ b/core/doc/admin/apps/files_trashbin/Utilization.html
@@@ -1,221 -1,0 +1,221 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>The deleted files app, when enabled, automatically moves deleted files to the Deleted Files folder and leaves them available for restore or permanent deletion</p>
+<div class="section" id="delete-a-file">
+<h2>Delete a file<a class="headerlink" href="#delete-a-file" title="Permalink to this headline">¶</a></h2>
+<p>To delete a file, either select the file check box and select Delete
+on the upper right of the screen,
+or the “x”
+to the right of the file.</p>
- <p><img alt="1000000000000530000001410CF0028A_png" src="../_images/1000000000000530000001410CF0028A.png" style="width: 6.5in; height: 1.5701in;" /></p>
++<p><img alt="1000000000000530000001410CF0028A_png" src="../../_images/1000000000000530000001410CF0028A.png" style="width: 6.5in; height: 1.5701in;" /></p>
+<p>To delete multiple files simultaneously, select the check box on all the desired files, then select Delete
+on the upper right of the screen.</p>
+</div>
+<div class="section" id="view-deleted-files">
+<h2>View Deleted Files<a class="headerlink" href="#view-deleted-files" title="Permalink to this headline">¶</a></h2>
+<p>To view a list of the deleted files, select the Deleted files
+button on the upper right of the browser.</p>
- <p><img alt="1000000000000532000000285DDBBF37_png" src="../_images/1000000000000532000000285DDBBF37.png" style="width: 6.5in; height: 0.1957in;" /></p>
++<p><img alt="1000000000000532000000285DDBBF37_png" src="../../_images/1000000000000532000000285DDBBF37.png" style="width: 6.5in; height: 0.1957in;" /></p>
+<p>Once selected, a list of all deleted files will appear.</p>
+</div>
+<div class="section" id="restore-files">
+<h2>Restore files<a class="headerlink" href="#restore-files" title="Permalink to this headline">¶</a></h2>
+<p>As with deleting files, there are two ways to restore a file.
+Either select the check box next to the file (or for bulk restore – files) and select restore
+on the upper right.
+Or hover over the file and select restore
+.</p>
- <p><img alt="1000000000000527000000A7AB409FE0_png" src="../_images/1000000000000527000000A7AB409FE0.png" style="width: 6.5in; height: 0.8228in;" />
- <img alt="100000000000052500000088DBB95005_png" src="../_images/100000000000052500000088DBB95005.png" style="width: 6.5in; height: 0.6717in;" /></p>
++<p><img alt="1000000000000527000000A7AB409FE0_png" src="../../_images/1000000000000527000000A7AB409FE0.png" style="width: 6.5in; height: 0.8228in;" />
++<img alt="100000000000052500000088DBB95005_png" src="../../_images/100000000000052500000088DBB95005.png" style="width: 6.5in; height: 0.6717in;" /></p>
+</div>
+<div class="section" id="permanently-delete-files">
+<h2>Permanently Delete Files<a class="headerlink" href="#permanently-delete-files" title="Permalink to this headline">¶</a></h2>
+<p>Files in the Deleted Files
+folder can be permanently deleted.
+To do this, either select the check box next to the file (or for bulk deletion – files) and select Delete in the upper right corner.
+Or hover over the file and select the “x”.
+See figure in section
+.</p>
+</div>
+<div class="section" id="nested-files-and-restore">
+<h2>Nested files and restore<a class="headerlink" href="#nested-files-and-restore" title="Permalink to this headline">¶</a></h2>
+<p>If, for instance, the directory structure within ownCloud is
+<em>~/public/support/documentation/ownCloud undelete</em>
+.</p>
- <p><img alt="1000000000000525000000BE30CF0423_png" src="../_images/1000000000000525000000BE30CF0423.png" style="width: 6.5in; height: 0.9374in;" /></p>
++<p><img alt="1000000000000525000000BE30CF0423_png" src="../../_images/1000000000000525000000BE30CF0423.png" style="width: 6.5in; height: 0.9374in;" /></p>
+<div class="section" id="delete-entire-directory-structure">
+<h3>Delete entire directory structure<a class="headerlink" href="#delete-entire-directory-structure" title="Permalink to this headline">¶</a></h3>
+<p>When the public folder is deleted, all child folders/files will also be deleted.</p>
- <p><img alt="100000000000052F000000C2867B7294_png" src="../_images/100000000000052F000000C2867B7294.png" style="width: 6.5in; height: 0.95in;" /></p>
++<p><img alt="100000000000052F000000C2867B7294_png" src="../../_images/100000000000052F000000C2867B7294.png" style="width: 6.5in; height: 0.95in;" /></p>
+<p>Suppose the file “ownCloud undelete.docx” was still required.
+A restore of the file will place it in the ‘root’ directory of the Files folder.</p>
+</div>
+<div class="section" id="delete-only-the-file">
+<h3>Delete only the file<a class="headerlink" href="#delete-only-the-file" title="Permalink to this headline">¶</a></h3>
+<p>If the file “ownCloud undelete.docx”
+was accidentally deleted, it may be restored following the steps described in section
+.
+The restore will place the file back into the directory structure from where it came.</p>
+</div>
+<div class="section" id="delete-the-file-then-the-directory-structure">
+<h3>Delete the file then the directory structure<a class="headerlink" href="#delete-the-file-then-the-directory-structure" title="Permalink to this headline">¶</a></h3>
+<p>If the file “ownCloud undelete.docs”
+is deleted, then the entire directory structure is deleted, the file will appear in the ‘root’ of the Deleted Files folder.</p>
- <p><img alt="1000000000000523000000C6F786381C_png" src="../_images/1000000000000523000000C6F786381C.png" style="width: 6.5in; height: 0.9783in;" /></p>
++<p><img alt="1000000000000523000000C6F786381C_png" src="../../_images/1000000000000523000000C6F786381C.png" style="width: 6.5in; height: 0.9783in;" /></p>
+<p>A restore of “ownCloud undelete.docx”
+will place it in the user’s ownCloud root directory.</p>
- <p><img alt="100000000000053100000142D9A4C916_png" src="../_images/100000000000053100000142D9A4C916.png" style="width: 6.5in; height: 1.5752in;" /></p>
++<p><img alt="100000000000053100000142D9A4C916_png" src="../../_images/100000000000053100000142D9A4C916.png" style="width: 6.5in; height: 1.5752in;" /></p>
+</div>
+</div>
+<div class="section" id="shared-files-and-restore">
+<h2>Shared files and restore<a class="headerlink" href="#shared-files-and-restore" title="Permalink to this headline">¶</a></h2>
+<p>When a
+shared file is deleted, the file will be deleted from the shared to user as well.
+Upon restore of the file by the file owner, the file is no longer shared.</p>
+</div>
+<div class="section" id="restore-files-with-versions">
+<h2>Restore files with Versions<a class="headerlink" href="#restore-files-with-versions" title="Permalink to this headline">¶</a></h2>
+<p>When a file which has versions has been deleted, and then restored, the versions will exist upon restoration.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_trashbin/index.html
index 745d177,0000000..b81d195
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_trashbin/index.html
+++ b/core/doc/admin/apps/files_trashbin/index.html
@@@ -1,166 -1,0 +1,166 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Deleted Files</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#expiry-of-deleted-files">Expiry of deleted files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration_and_storage_.html">Configuration and storage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration_and_storage_.html#configuration">Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration_and_storage_.html#storage">Storage</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#delete-a-file">Delete a file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#view-deleted-files">View Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#restore-files">Restore files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#permanently-delete-files">Permanently Delete Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#nested-files-and-restore">Nested files and restore</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#shared-files-and-restore">Shared files and restore</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#restore-files-with-versions">Restore files with Versions</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_versions/Configuration_and_storage.html
index 62ae67e,0000000..64f23e0
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_versions/Configuration_and_storage.html
+++ b/core/doc/admin/apps/files_versions/Configuration_and_storage.html
@@@ -1,166 -1,0 +1,166 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration and storage — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration-and-storage">
+<h1>Configuration and storage<a class="headerlink" href="#configuration-and-storage" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="configuration">
+<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
+<p>By default, the ownCloud versions app is enabled.
+To verify or disable, navigate to the apps
+page and select Versions.</p>
- <p><img alt="10000000000004ED000000BE3B9E25D5_png" src="../_images/10000000000004ED000000BE3B9E25D5.png" style="width: 6.5in; height: 0.9791in;" />
- <img alt="1000000000000336000000F38C3FAF84_png" src="../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
- <img alt="1000000000000336000000F38C3FAF84_png" src="../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
- <img alt="1000000000000336000000F38C3FAF84_png" src="../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
- <img alt="1000000000000336000000F38C3FAF84_png" src="../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" /></p>
++<p><img alt="10000000000004ED000000BE3B9E25D5_png" src="../../_images/10000000000004ED000000BE3B9E25D5.png" style="width: 6.5in; height: 0.9791in;" />
++<img alt="1000000000000336000000F38C3FAF84_png" src="../../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
++<img alt="1000000000000336000000F38C3FAF84_png" src="../../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
++<img alt="1000000000000336000000F38C3FAF84_png" src="../../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" />
++<img alt="1000000000000336000000F38C3FAF84_png" src="../../_images/1000000000000336000000F38C3FAF84.png" style="width: 6.5in; height: 1.9217in;" /></p>
+</div>
+<div class="section" id="storage">
+<h2>Storage<a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h2>
+<p>Previous versions of files are stored in the
+data/<user>/files_versions
+folder.</p>
- <p><img alt="100000000000021C0000004CACBF786C_png" src="../_images/100000000000021C0000004CACBF786C.png" style="width: 5.6252in; height: 0.7917in;" /></p>
++<p><img alt="100000000000021C0000004CACBF786C_png" src="../../_images/100000000000021C0000004CACBF786C.png" style="width: 5.6252in; height: 0.7917in;" /></p>
+<p>This directory is automatically created when the first file version is created.</p>
+<p>The naming convention of the files in this directory are
+<file_name>.v<unix_timestamp>.</p>
- <p><img alt="10000000000002210000002DE3BE7515_png" src="../_images/10000000000002210000002DE3BE7515.png" style="width: 5.6772in; height: 0.4689in;" /></p>
++<p><img alt="10000000000002210000002DE3BE7515_png" src="../../_images/10000000000002210000002DE3BE7515.png" style="width: 5.6772in; height: 0.4689in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_versions/Introduction.html
index fba948b,0000000..fa50417
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_versions/Introduction.html
+++ b/core/doc/admin/apps/files_versions/Introduction.html
@@@ -1,163 -1,0 +1,163 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Versions app maintains older versions of a file which have been modified by an ownCloud user.</p>
+<div class="section" id="expiry-of-versions">
+<h2>Expiry of versions<a class="headerlink" href="#expiry-of-versions" title="Permalink to this headline">¶</a></h2>
+<p>The versions app expires old versions automatically to make certain that the user doesn’t run out of space.
+The following algorithm is used to delete old versions:</p>
+<ul class="simple">
+<li>ownCloud keeps one new version every 2 seconds for the first 10 seconds</li>
+<li>ownCloud keeps one new version every minute for the first hour</li>
+<li>ownCloud keeps one new version every hour for the first 24 hours</li>
+<li>ownCloud keeps one new version every day for the first 30 days</li>
+<li>ownCloud keeps one new version every week thereafter.</li>
+</ul>
+<p>The versions are adjusted along this algorithm every time a new version is created.</p>
+</div>
+<div class="section" id="space-limitations">
+<h2>Space limitations<a class="headerlink" href="#space-limitations" title="Permalink to this headline">¶</a></h2>
+<p>In addition to the expiry of versions, ownCloud’s versions app makes certain never to use more than 50% of the user’s currently available free space.
+If stored versions exceed this limit, ownCloud will delete the oldest versions first until it meets this limit.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_versions/Utilization.html
index b3b0641,0000000..878b7fa
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_versions/Utilization.html
+++ b/core/doc/admin/apps/files_versions/Utilization.html
@@@ -1,201 -1,0 +1,201 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>The versions app, when enabled, automatically creates a new version each time an existing, non-empty file is saved.</p>
+<div class="section" id="initial-file-creation">
+<h2>Initial File creation<a class="headerlink" href="#initial-file-creation" title="Permalink to this headline">¶</a></h2>
+<p>Create a file on the ownCloud server – either directly via the browser, an upload, or a file sync from the client.
+In this example, the file versionText.txt was created via the web browser.</p>
- <p><img alt="1000000000000427000000324F58266D_png" src="../_images/1000000000000427000000324F58266D.png" style="width: 6.5in; height: 0.3055in;" /></p>
++<p><img alt="1000000000000427000000324F58266D_png" src="../../_images/1000000000000427000000324F58266D.png" style="width: 6.5in; height: 0.3055in;" /></p>
+<div class="section" id="note">
+<h3>Note<a class="headerlink" href="#note" title="Permalink to this headline">¶</a></h3>
+<p>Since this file was initially created via the web browser, it is an empty file.</p>
+</div>
+</div>
+<div class="section" id="edit-the-file">
+<h2>Edit the file<a class="headerlink" href="#edit-the-file" title="Permalink to this headline">¶</a></h2>
+<p>Edit the file through the web browser.</p>
- <p><img alt="100000000000019E0000004CD2A0F407_png" src="../_images/100000000000019E0000004CD2A0F407.png" style="width: 4.3126in; height: 0.7917in;" /></p>
++<p><img alt="100000000000019E0000004CD2A0F407_png" src="../../_images/100000000000019E0000004CD2A0F407.png" style="width: 4.3126in; height: 0.7917in;" /></p>
+<p>And save.</p>
+<div class="section" id="notes">
+<h3>Notes<a class="headerlink" href="#notes" title="Permalink to this headline">¶</a></h3>
+<p>Editing an empty file, as in this instance, for the first time, does not create a new version.</p>
+</div>
+</div>
+<div class="section" id="create-version">
+<h2>Create version<a class="headerlink" href="#create-version" title="Permalink to this headline">¶</a></h2>
+<p>Edit the non-zero byte file either via the web browser, via the sync client or via an upload.</p>
- <p><img alt="1000000000000194000000498325A766_png" src="../_images/1000000000000194000000498325A766.png" style="width: 4.2083in; height: 0.7602in;" /></p>
++<p><img alt="1000000000000194000000498325A766_png" src="../../_images/1000000000000194000000498325A766.png" style="width: 4.2083in; height: 0.7602in;" /></p>
+<p>And save.</p>
+<div class="section" id="id1">
+<h3>Notes<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>When performing an upload of a file which already exists on the server, a dialog box appears asking whether to keep the existing file or the new file.</p>
- <p><img alt="10000000000001C1000000FE663748B2_png" src="../_images/10000000000001C1000000FE663748B2.png" style="width: 4.6772in; height: 2.6457in;" /></p>
++<p><img alt="10000000000001C1000000FE663748B2_png" src="../../_images/10000000000001C1000000FE663748B2.png" style="width: 4.6772in; height: 2.6457in;" /></p>
+<p>In order to create a version, the New File must be selected.
+If the Existing File is selected, the file is not replaced hence no new version is created.</p>
+</div>
+</div>
+<div class="section" id="accessing-versions">
+<h2>Accessing Versions<a class="headerlink" href="#accessing-versions" title="Permalink to this headline">¶</a></h2>
+<p>In order to view what versions exist for a given file, hover over the line containing the file and select Versions
+on the right side.</p>
- <p><img alt="1000000000000430000000AF9D6E724E_png" src="../_images/1000000000000430000000AF9D6E724E.png" style="width: 6.5in; height: 1.061in;" /></p>
++<p><img alt="1000000000000430000000AF9D6E724E_png" src="../../_images/1000000000000430000000AF9D6E724E.png" style="width: 6.5in; height: 1.061in;" /></p>
+<p>In this case, there are two previous versions of versionTest.txt
+.
+The thumbnail and creation time can be used to identify what was in the file in that version.</p>
+</div>
+<div class="section" id="reverting-to-a-different-version">
+<h2>Reverting to a different version<a class="headerlink" href="#reverting-to-a-different-version" title="Permalink to this headline">¶</a></h2>
+<p>To revert to a previous version, simply select the restore next to the version as seen in
+.</p>
+<div class="section" id="id2">
+<h3>Notes<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>In the instance where a file is reverted to another version, the “existing” version of the file is versioned and can be reverted at a later date.</p>
+</div>
+</div>
+<div class="section" id="sharing-and-versions">
+<h2>Sharing and Versions<a class="headerlink" href="#sharing-and-versions" title="Permalink to this headline">¶</a></h2>
+<p>If user-A shares a file with user-B, user-B may revert the file to any previous version.
+If user-B modifies the file, a new version is created.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/files_versions/index.html
index 0e20cc4,0000000..7ec7d8b
mode 100644,000000..100644
--- a/core/doc/admin/apps/files_versions/index.html
+++ b/core/doc/admin/apps/files_versions/index.html
@@@ -1,169 -1,0 +1,169 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Versioning</strong></p>
+<p>Table of Contents</p>
+<p>` <#_Toc374004001>`_</p>
+<p>Reviewers</p>
+<p>Allen Gigler 12/4/2013</p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#expiry-of-versions">Expiry of versions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#space-limitations">Space limitations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration_and_storage.html">Configuration and storage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration_and_storage.html#configuration">Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration_and_storage.html#storage">Storage</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#initial-file-creation">Initial File creation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#edit-the-file">Edit the file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#create-version">Create version</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#accessing-versions">Accessing Versions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#reverting-to-a-different-version">Reverting to a different version</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Utilization.html#sharing-and-versions">Sharing and Versions</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/Configuration.html
index 769a1e2,0000000..aa2239e
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/Configuration.html
+++ b/core/doc/admin/apps/firstrunwizard/Configuration.html
@@@ -1,147 -1,0 +1,147 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<p>The First Run Wizard app is enabled by default.
+To verify or disable this app, navigate to the apps page and select “First Run Wizard”</p>
- <p><img alt="1000000000000200000000BCCCC35DEB_png" src="../_images/1000000000000200000000BCCCC35DEB.png" style="width: 5.3335in; height: 1.9583in;" /></p>
++<p><img alt="1000000000000200000000BCCCC35DEB_png" src="../../_images/1000000000000200000000BCCCC35DEB.png" style="width: 5.3335in; height: 1.9583in;" /></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/Introduction.html
index da6f254,0000000..062f2ec
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/Introduction.html
+++ b/core/doc/admin/apps/firstrunwizard/Introduction.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud First Run Wizard is a welcome screen which links users to the various ownCloud utilities such as the Sync Client, Mobile Apps, and WebDav</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/Links.html
index 82e014e,0000000..649b150
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/Links.html
+++ b/core/doc/admin/apps/firstrunwizard/Links.html
@@@ -1,165 -1,0 +1,165 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Links — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="links">
+<h1>Links<a class="headerlink" href="#links" title="Permalink to this headline">¶</a></h1>
+<p>The wizard contains links for the Desktop app, Android App on Google Play, and iOS on the App store, as well as how to access files via WebDav.</p>
+<div class="section" id="desktop-app">
+<h2>Desktop App<a class="headerlink" href="#desktop-app" title="Permalink to this headline">¶</a></h2>
+<p>Selecting the Desktop App link will bring the user to ownCloud’s web site to download the client.</p>
- <p><img alt="1000000000000557000002E148BAB6D4_png" src="../_images/1000000000000557000002E148BAB6D4.png" style="width: 6.5in; height: 3.5043in;" /></p>
++<p><img alt="1000000000000557000002E148BAB6D4_png" src="../../_images/1000000000000557000002E148BAB6D4.png" style="width: 6.5in; height: 3.5043in;" /></p>
+</div>
+<div class="section" id="android-app">
+<h2>Android App<a class="headerlink" href="#android-app" title="Permalink to this headline">¶</a></h2>
+<p>Selecting the Android App will load the web page to purchase the android client from the Google Play store.</p>
- <p><img alt="1000000000000668000002D29EAD9899_png" src="../_images/1000000000000668000002D29EAD9899.png" style="width: 6.5in; height: 2.861in;" /></p>
++<p><img alt="1000000000000668000002D29EAD9899_png" src="../../_images/1000000000000668000002D29EAD9899.png" style="width: 6.5in; height: 2.861in;" /></p>
+</div>
+<div class="section" id="ios-app">
+<h2>iOS App<a class="headerlink" href="#ios-app" title="Permalink to this headline">¶</a></h2>
+<p>Selecting the iOS App loads the itunes web page to obtain the ownCloud iOS mobile client.</p>
- <p><img alt="10000000000005F30000030F1372448D_png" src="../_images/10000000000005F30000030F1372448D.png" style="width: 6.5in; height: 3.3417in;" /></p>
++<p><img alt="10000000000005F30000030F1372448D_png" src="../../_images/10000000000005F30000030F1372448D.png" style="width: 6.5in; height: 3.3417in;" /></p>
+</div>
+<div class="section" id="access-files-via-webdav">
+<h2>Access files via WebDAV<a class="headerlink" href="#access-files-via-webdav" title="Permalink to this headline">¶</a></h2>
+<p>This link brings up a link with documentation on how to access files on the ownCloud server using WebDAV.</p>
- <p><img alt="100000000000066D000001AAD8CE8256_png" src="../_images/100000000000066D000001AAD8CE8256.png" style="width: 6.5in; height: 1.6835in;" /></p>
++<p><img alt="100000000000066D000001AAD8CE8256_png" src="../../_images/100000000000066D000001AAD8CE8256.png" style="width: 6.5in; height: 1.6835in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/Table_of_Contents.html
index e051e1d,0000000..caf4ddd
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/Table_of_Contents.html
+++ b/core/doc/admin/apps/firstrunwizard/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374456284>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/Usage.html
index 8b90f2c,0000000..a3c6990
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/Usage.html
+++ b/core/doc/admin/apps/firstrunwizard/Usage.html
@@@ -1,149 -1,0 +1,149 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Usage — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="usage">
+<h1>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h1>
+<p>When enabled, a user entering the ownCloud web browser for the first time will have the Welcome screen popup.</p>
- <p><img alt="10000000000004920000028D9C8DC2CB_png" src="../_images/10000000000004920000028D9C8DC2CB.png" style="width: 6.5in; height: 3.628in;" /></p>
++<p><img alt="10000000000004920000028D9C8DC2CB_png" src="../../_images/10000000000004920000028D9C8DC2CB.png" style="width: 6.5in; height: 3.628in;" /></p>
+<p>To close the window, select the ‘x’ in the upper right corner.
+If the user would like to bring up this window at a later time, they may do so by navigating to the Personal menu selection and select “Show First Run Wizard again”</p>
- <p><img alt="10000000000002A6000000BFBE298238_png" src="../_images/10000000000002A6000000BFBE298238.png" style="width: 6.5in; height: 1.8311in;" /></p>
++<p><img alt="10000000000002A6000000BFBE298238_png" src="../../_images/10000000000002A6000000BFBE298238.png" style="width: 6.5in; height: 1.8311in;" /></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/firstrunwizard/index.html
index 02278cb,0000000..34fe1e3
mode 100644,000000..100644
--- a/core/doc/admin/apps/firstrunwizard/index.html
+++ b/core/doc/admin/apps/firstrunwizard/index.html
@@@ -1,157 -1,0 +1,157 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud First Run Wizard</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Usage.html">Usage</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Links.html">Links</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Links.html#desktop-app">Desktop App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Links.html#android-app">Android App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Links.html#ios-app">iOS App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Links.html#access-files-via-webdav">Access files via WebDAV</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/user_ldap/CONFIGURATION.html
index 7f782b2,0000000..0c6925b
mode 100644,000000..100644
--- a/core/doc/admin/apps/user_ldap/CONFIGURATION.html
+++ b/core/doc/admin/apps/user_ldap/CONFIGURATION.html
@@@ -1,484 -1,0 +1,484 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>CONFIGURATION — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>CONFIGURATION<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="enable-ldap-app">
+<h2>Enable LDAP app<a class="headerlink" href="#enable-ldap-app" title="Permalink to this headline">¶</a></h2>
+<p>From the
+APPs
+page, select “
+LDAP user and group backend”
+and select
+enable</p>
- <p><img alt="1000020100000359000000A8B848DE68_png" src="../_images/1000020100000359000000A8B848DE68.png" /></p>
++<p><img alt="1000020100000359000000A8B848DE68_png" src="../../_images/1000020100000359000000A8B848DE68.png" /></p>
+</div>
+<div class="section" id="configuring-ldap">
+<h2>Configuring LDAP<a class="headerlink" href="#configuring-ldap" title="Permalink to this headline">¶</a></h2>
+<p>The configuration of the LDAP feature is performed on the Admin page of the ownCloud web browser.
+The configuration follows a wizard-like approach split into four tabs.
+The first tab must be completed correctly to allow access to subsequent tabs.
+Although the configuration in the remaining tabs is detected automatically, it should be reviewed by the admin to verify correctness.
+An indicator exists on the all pages
+to show whether the configuration is valid, incomplete, or incorrect.</p>
+<p>Configuration settings are saved automatically when the cursor is no longer focused on the input element.</p>
+<div class="section" id="server-tab">
+<h3>Server Tab<a class="headerlink" href="#server-tab" title="Permalink to this headline">¶</a></h3>
+<p>The server tab contains basic information on the LDAP server.
+It makes certain that ownCloud can connect to the desired LDAP and read data from it.
+At a minimum, the admin must provide a hostname for the LDAP server.
+If anonymous access to the LDAP server is not allowed, the admin will be required to enter an account Distinguished Name (DN) and password.
+ownCloud will auto-detect the port and base DN.</p>
+<div class="section" id="server">
+<h4>Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h4>
+<p>ownCloud can be configured to connect to multiple LDAP servers.
+Using this control you can pick a configuration you want to edit or to add a new one.
+The button
+Delete Configuration deletes the current configuration.</p>
+</div>
+<div class="section" id="host">
+<h4>Host<a class="headerlink" href="#host" title="Permalink to this headline">¶</a></h4>
+<p>The hostname of the LDAP server.
+It can also be a ldaps:// URI.
+It is possible to pass a port number which will speed up port detection.
+This is especially useful if a custom port is used.
+ownCloud will subsequently move the port value to the port field.</p>
+<p>Examples:</p>
+<ul class="simple">
+<li>Directory.my-company.com</li>
+<li>Ldaps://directory.my-company.com</li>
+<li>Directory.my-company.com:9876</li>
+</ul>
+</div>
+<div class="section" id="port">
+<h4>Port<a class="headerlink" href="#port" title="Permalink to this headline">¶</a></h4>
+<p>This is the port which ownCloud should utilize to connect to the LDAP server.
+Upon initial configuration, this field is disabled.
+ownCloud will auto-detect the port if it is running on a standard port (389).
+After ownCloud detects the port, the field will be enabled for admin input.
+A successfully discovered port will be inserted by ownCloud.</p>
+</div>
+<div class="section" id="user-dn">
+<h4>User DN<a class="headerlink" href="#user-dn" title="Permalink to this headline">¶</a></h4>
+<p>The name as DN of a user who is able to do searches in the LDAP directory.
+For anonymous access, leave this field blank.
+It is recommended to have a special system user for ownCloud.
+This information is provided by the LDAP admin.</p>
+</div>
+<div class="section" id="password">
+<h4>Password<a class="headerlink" href="#password" title="Permalink to this headline">¶</a></h4>
+<p>The password for the user given above.
+For anonymous access, leave this blank.
+This information is provided by the LDAP admin.</p>
+</div>
+<div class="section" id="base-dn">
+<h4>Base DN<a class="headerlink" href="#base-dn" title="Permalink to this headline">¶</a></h4>
+<p>The base DM of the LDAP from where all users and groups can be reached.
+It is possible to provide separated base DN’s for users and groups in the advanced tab.
+This is a mandatory field.
+ownCloud will attempt to determine the proper value of this field based on the provided User DN or Host values.</p>
- <p><img alt="100000000000043200000169BCD20493_png" src="../_images/100000000000043200000169BCD20493.png" style="width: 6.5in; height: 2.1846in;" /></p>
++<p><img alt="100000000000043200000169BCD20493_png" src="../../_images/100000000000043200000169BCD20493.png" style="width: 6.5in; height: 2.1846in;" /></p>
+</div>
+</div>
+<div class="section" id="user-filter">
+<h3>User Filter<a class="headerlink" href="#user-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in the User Filter tab determine which LDAP users will appear and will be able to log into ownCloud.
+This may be configured using the wizard or entered via a raw LDAP filter.</p>
+<div class="section" id="only-those-object-classes">
+<h4>Only those object classes<a class="headerlink" href="#only-those-object-classes" title="Permalink to this headline">¶</a></h4>
+<p>ownCloud will determine the available object classes.
+ownCloud will automatically select the object that contains the highest number of users.
+It is possible to select multiple object classes.</p>
+</div>
+<div class="section" id="only-from-those-groups">
+<h4>Only from those groups<a class="headerlink" href="#only-from-those-groups" title="Permalink to this headline">¶</a></h4>
+<p>This is used if the LDAP server supports the member-of-overlay in LDAP filters.
+It allows the admin to define the users from one or more certain groups that are allowed to appear and log into ownCloud.
+No value is selected by default.
+It is possible to select multiple groups.</p>
+<p>If the LDAP server does not support member-of-overlay in LDAP filters, the field is disabled.</p>
+</div>
+<div class="section" id="edit-raw-filter-instead">
+<h4>Edit raw filter instead<a class="headerlink" href="#edit-raw-filter-instead" title="Permalink to this headline">¶</a></h4>
+<p>Selecting this text will toggle the filter mode.
+Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field.</p>
+<p>Example:</p>
+<ul class="simple">
+<li>objectClass=inetOrgPerson</li>
+</ul>
+</div>
+<div class="section" id="x-users-found">
+<h4>x users found<a class="headerlink" href="#x-users-found" title="Permalink to this headline">¶</a></h4>
+<p>Indicates the approximate number of users allowed to access ownCloud.
+This number will update after any changes made to the LDAP configuration.</p>
- <p><img alt="100000000000042500000163D2B339D5_png" src="../_images/100000000000042500000163D2B339D5.png" style="width: 6.5in; height: 2.1752in;" /></p>
++<p><img alt="100000000000042500000163D2B339D5_png" src="../../_images/100000000000042500000163D2B339D5.png" style="width: 6.5in; height: 2.1752in;" /></p>
+</div>
+</div>
+<div class="section" id="login-filter">
+<h3>Login Filter<a class="headerlink" href="#login-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in the login filter tab determine which user information will be compared to login credentials entered by the user.
+It is possible to allow multiple user details.
+It is also possible to enter a raw LDAP filter.</p>
+<div class="section" id="ldap-username">
+<h4>LDAP Username<a class="headerlink" href="#ldap-username" title="Permalink to this headline">¶</a></h4>
+<p>If checked, the login credentials will be compared to the username in the LDAP directory.
+The corresponding attribute, usually “uid” or “samaccountname” will be automatically detected by ownCloud.</p>
+</div>
+<div class="section" id="ldap-email-address">
+<h4>LDAP Email Address<a class="headerlink" href="#ldap-email-address" title="Permalink to this headline">¶</a></h4>
+<p>If checked, the login credentials will be compared to an email address in the LDAP directory.
+ownCloud will exmaine the “mailPrimaryAddress” and “mail” attributes in the LDAP for the email address.</p>
+</div>
+<div class="section" id="other-attributes">
+<h4>Other attributes<a class="headerlink" href="#other-attributes" title="Permalink to this headline">¶</a></h4>
+<p>This field allows the admin to select additional attributes for comparison.
+The list is generated automatically based on the attributes contained in the user object of the LDAP server.</p>
+</div>
+<div class="section" id="enter-raw-filter-instead">
+<h4>Enter raw filter instead<a class="headerlink" href="#enter-raw-filter-instead" title="Permalink to this headline">¶</a></h4>
+<p>Selecting this text will toggle the filter mode.
+Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field.</p>
+<p>The “%uid” placeholder will be replaced with the login name entered by the user upon login.</p>
+<p>Examples:</p>
+<ul class="simple">
+<li>Username only:
+uid=%iud</li>
+<li>Username or email address: (<a href="#id1"><span class="problematic" id="id2">|</span></a>(uid=%uid)(mail=%uid))</li>
+</ul>
- <p><img alt="10000000000004170000016ACB5E15AE_png" src="../_images/10000000000004170000016ACB5E15AE.png" style="width: 6.5in; height: 2.2465in;" /></p>
++<p><img alt="10000000000004170000016ACB5E15AE_png" src="../../_images/10000000000004170000016ACB5E15AE.png" style="width: 6.5in; height: 2.2465in;" /></p>
+</div>
+</div>
+<div class="section" id="group-filter">
+<h3>Group Filter<a class="headerlink" href="#group-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in this tab determine which groups will be available in ownCloud.
+This tab does not restrict logins in any manner as that was handled in the prior tabs.
+It is possible to enter a raw LDAP filter as well.</p>
+<p>By default, there are no groups available in ownCloud.
+The admin must enable this manually.</p>
+<div class="section" id="id3">
+<h4>Only those object classes<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h4>
+<p>ownCloud will automatically determine which object classes are available in the LDAP.
+ownCloud will only list object classes that return at least one group object.
+It is possible to enter multiple object classes.</p>
+</div>
+<div class="section" id="id4">
+<h4>Only from those groups<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h4>
+<p>This setting allows the admin to select which groups are available within ownCloud.
+ownCloud will generate a list of available groups found in the LDAP server for the admin to select.
+It is possible to enter multiple groups.</p>
+</div>
+<div class="section" id="id5">
+<h4>Edit raw filter instead<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h4>
+<p>Selecting this text will toggle the filter mode.
+Instead of the wizard’s assistance, the admin may enter the raw LDAP filter in this field</p>
+</div>
+<div class="section" id="y-groups-found">
+<h4>Y groups found<a class="headerlink" href="#y-groups-found" title="Permalink to this headline">¶</a></h4>
+<p>Indicates the approximate number of groups available in ownCloud.
+This number will update after any changes made to the LDAP configuration.</p>
- <p><img alt="100000000000043000000164DA0CE8C9_png" src="../_images/100000000000043000000164DA0CE8C9.png" style="width: 6.5in; height: 2.1583in;" /></p>
++<p><img alt="100000000000043000000164DA0CE8C9_png" src="../../_images/100000000000043000000164DA0CE8C9.png" style="width: 6.5in; height: 2.1583in;" /></p>
+</div>
+</div>
+<div class="section" id="advanced-tab">
+<h3>Advanced Tab<a class="headerlink" href="#advanced-tab" title="Permalink to this headline">¶</a></h3>
+<p>The LDAP Advanced settings section allows the admin to define less common options.
+These options are not required for a working connection however, they can have a positive effect on the performance.</p>
+<p>The Advanced Settings tab has three sections</p>
+<ul class="simple">
+<li>Connection settings</li>
+<li>Directory settings</li>
+<li>Special attributes</li>
+</ul>
+<div class="section" id="connection-settings">
+<h4>Connection Settings<a class="headerlink" href="#connection-settings" title="Permalink to this headline">¶</a></h4>
+<div class="section" id="configuration-active">
+<h5>Configuration Active<a class="headerlink" href="#configuration-active" title="Permalink to this headline">¶</a></h5>
+<p>Allows the admin to enable or disable the current configuration.
+A disabled configuration will not connect to the LDAP server.</p>
+<p>By default, this is disabled.
+It is enabled automatically, when using the wizard and configuration is valid and tests successfully.</p>
+</div>
+<div class="section" id="backup-replica-host">
+<h5>Backup (Replica) Host<a class="headerlink" href="#backup-replica-host" title="Permalink to this headline">¶</a></h5>
+<p>This is used to define a backup LDAP server.
+ownCloud automatically attempts to connect to the backup server when the primary server cannot be accessed.
+It is important that the backup server is an exact replica of the primary server as all the object UUIDs must match.</p>
+</div>
+<div class="section" id="backup-replica-port">
+<h5>Backup (Replica) Port<a class="headerlink" href="#backup-replica-port" title="Permalink to this headline">¶</a></h5>
+<p>This identifies the port on which ownCloud will connect to the backup LDAP server.
+If no port is provided, ownCloud will utilize the same port as the primary LDAP server.</p>
+</div>
+<div class="section" id="disable-main-server">
+<h5>Disable Main Server<a class="headerlink" href="#disable-main-server" title="Permalink to this headline">¶</a></h5>
+<p>This is used to disable the primary LDAP server so ownCloud will connect only to the backup server.
+This can be useful for planned maintenance on the primary server.</p>
+</div>
+<div class="section" id="case-insensitive-ldap-server-windows">
+<h5>Case insensitive LDAP server (Windows)<a class="headerlink" href="#case-insensitive-ldap-server-windows" title="Permalink to this headline">¶</a></h5>
+<p>Check this if the LDAP server is running on a windows host.
+Not usually necessary.</p>
+</div>
+<div class="section" id="turn-off-ssl-certificate-validation">
+<h5>Turn off SSL certificate validation<a class="headerlink" href="#turn-off-ssl-certificate-validation" title="Permalink to this headline">¶</a></h5>
+<p>Disables the check for a valid SSL certificate.
+It is recommended to use for testing only if needed, but not use in production.</p>
+</div>
+<div class="section" id="cache-time-to-live">
+<h5>Cache Time-To-Live<a class="headerlink" href="#cache-time-to-live" title="Permalink to this headline">¶</a></h5>
+<p>ownCloud caches the information it receives from the LDAP server.
+This is necessary as the ownCloud server attempts to validate the user with every page request or WebDAV interaction.
+This time is in seconds.</p>
+<p>Note if it is required to have the most up-to-date information from the LDAP, it is recommended not to turn off the cache totally, however, to define a lifetime of a small duration (15 seconds)</p>
- <p><img alt="100000000000042E000001D3EEB9978B_png" src="../_images/100000000000042E000001D3EEB9978B.png" style="width: 6.5in; height: 2.8366in;" /></p>
++<p><img alt="100000000000042E000001D3EEB9978B_png" src="../../_images/100000000000042E000001D3EEB9978B.png" style="width: 6.5in; height: 2.8366in;" /></p>
+</div>
+</div>
+<div class="section" id="directory-settings">
+<h4>Directory Settings<a class="headerlink" href="#directory-settings" title="Permalink to this headline">¶</a></h4>
+<div class="section" id="user-display-name-field">
+<h5>User Display Name Field<a class="headerlink" href="#user-display-name-field" title="Permalink to this headline">¶</a></h5>
+<p>The attribute that should be used as display name in ownCloud.</p>
+</div>
+<div class="section" id="base-user-tree">
+<h5>Base User Tree<a class="headerlink" href="#base-user-tree" title="Permalink to this headline">¶</a></h5>
+<p>The Base DN of LDAP, from where all users can be reached.
+It needs to be given completely despite to the Base DN from the Basic Settings.
+You can specify multiple base trees, one in each line.</p>
+</div>
+<div class="section" id="user-search-attributes">
+<h5>User Search Attributes<a class="headerlink" href="#user-search-attributes" title="Permalink to this headline">¶</a></h5>
+<p>These attributes are used when a search for users with a search string is done.
+This happens in the share dialogue.
+By default the user display name attribute as specified above is used.
+Multiple attributes can be given, one in each line.</p>
+<p>Note: if an attribute is not available for a given user object, the user will neither be listed nor able to login.</p>
+</div>
+<div class="section" id="group-display-name-field">
+<h5>Group Display Name Field<a class="headerlink" href="#group-display-name-field" title="Permalink to this headline">¶</a></h5>
+<p>The attribute that should be used as an ownCloud group name.
+ownCloud allows a limited set of characters (a-zA_Z0-9,-_@).
+Every other character will be replaced in ownCloud.
+Once a group bane is assigned, it will not be changed.</p>
+</div>
+<div class="section" id="base-group-tree">
+<h5>Base Group Tree<a class="headerlink" href="#base-group-tree" title="Permalink to this headline">¶</a></h5>
+<p>The base DN of LDAP from where all groups can be reached.
+It needs to be given completely despite to the Base DN from the Basic Settings.
+You can specify multiple base trees, one in each line.</p>
+</div>
+<div class="section" id="group-search-attributes">
+<h5>Group Search Attributes<a class="headerlink" href="#group-search-attributes" title="Permalink to this headline">¶</a></h5>
+<p>These attributes are used when a search for groups with a search string is done.
+This happens in the share dialogue for instance.
+By default the group display name attribute as specified above is being used.
+Multiple attributes can be given, one in each line.</p>
+</div>
+<div class="section" id="group-member-association">
+<h5>Group Member association<a class="headerlink" href="#group-member-association" title="Permalink to this headline">¶</a></h5>
+<p>The attribute that is used to indicate group memberships.</p>
- <p><img alt="10000201000005F90000029D8BA200FB_png" src="../_images/10000201000005F90000029D8BA200FB.png" /></p>
++<p><img alt="10000201000005F90000029D8BA200FB_png" src="../../_images/10000201000005F90000029D8BA200FB.png" /></p>
+</div>
+</div>
+<div class="section" id="special-attributes">
+<h4>Special Attributes<a class="headerlink" href="#special-attributes" title="Permalink to this headline">¶</a></h4>
+<div class="section" id="quota-field">
+<h5>Quota Field<a class="headerlink" href="#quota-field" title="Permalink to this headline">¶</a></h5>
+<p>This field is used to set a LDAP attribute to define the user quota.
+The attribute should retain a readable value, for example “2 GB”.</p>
+</div>
+<div class="section" id="quota-default">
+<h5>Quota Default<a class="headerlink" href="#quota-default" title="Permalink to this headline">¶</a></h5>
+<p>This is used to override the ownCloud default quota for LDAP users who do not have an attribute set in the above parameter.</p>
+<p>Example</p>
+<p>15GB</p>
+</div>
+<div class="section" id="email-field">
+<h5>Email Field<a class="headerlink" href="#email-field" title="Permalink to this headline">¶</a></h5>
+<p>ownCloud will read the attribute configured here and configure the user’s email.</p>
+</div>
+<div class="section" id="user-home-folder-naming-rule">
+<h5>User Home Folder Naming Rule<a class="headerlink" href="#user-home-folder-naming-rule" title="Permalink to this headline">¶</a></h5>
+<p>By default, ownCloud creates a user directory which contains all files and meta data based on the ownCloud user name.
+To override this setting and name it after a different attribute, configure that attribute here.
+The attribute can also return an absolute path (such as “/mnt/storage43/alice”).</p>
- <p><img alt="100000000000041D0000017D8D1BC4D9_png" src="../_images/100000000000041D0000017D8D1BC4D9.png" style="width: 6.5in; height: 2.352in;" /></p>
++<p><img alt="100000000000041D0000017D8D1BC4D9_png" src="../../_images/100000000000041D0000017D8D1BC4D9.png" style="width: 6.5in; height: 2.352in;" /></p>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="expert-tab">
+<h2>Expert Tab<a class="headerlink" href="#expert-tab" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="internal-username">
+<h3>Internal Username<a class="headerlink" href="#internal-username" title="Permalink to this headline">¶</a></h3>
+<p>The internal username is the identifier in ownCloud for LDAP users.
+By default it will be created from the UUID attribute.
+By using the UUID attribute it is made sure that the username is unique and characters do not need to be converted.
+The internal username has the restriction that only these characters are allowed [<a href="#id6"><span class="problematic" id="id7">a-zA-Z0-0_</span></a>.@-].
+Other characters are replaced with their ASCII correspondence or are simply omitted</p>
+<p>The LDAP backend ensures that there are no duplicate internal usernames in ownCloud, i.e. that it is checking all other activated user back ends (including local ownCloud users). On collisions a random number (between 1000 and 9999) will be attached to the retrieved value. For example, if “alice” exists, the next username may be “alice_1337”.</p>
+<p>The internal username is also the default name for the user home folder in ownCloud. It is also a part of remote URLs, for instance for all *DAV services. With this setting the default behavior can be overridden.</p>
+<p>Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users.</p>
+</div>
+<div class="section" id="override-uuid-detection">
+<h3>Override UUID detection<a class="headerlink" href="#override-uuid-detection" title="Permalink to this headline">¶</a></h3>
+<p>By default ownCloud auto-detects the UUID attribute.
+The UUID attribute is used to doubtlessly identify LDAP users and groups.
+Also, the internal username will be created based on the UUID, if not specified from above.</p>
+<p>You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups. It also will have effect when a user’s or group’s DN changes and an old UUID was cached: It will result in a new user.
+Because of this, the setting should be applied before putting ownCloud in production use and cleaning the bindings (see below).</p>
+</div>
+<div class="section" id="username-ldap-user-mapping">
+<h3>Username-LDAP User Mapping<a class="headerlink" href="#username-ldap-user-mapping" title="Permalink to this headline">¶</a></h3>
+<p>ownCloud uses the usernames as key to store and assign data.
+In order to precisely identify and recognize users, each LDAP user will have an internal username in ownCloud.
+This requires a mapping from ownCloud username to LDAP user.
+The created username is mapped to the UUID of the LDAP user.
+Additionally the DN is cached as well to reduce LDAP interaction, but is not used for identification.
+If the DN changes, the change will be detected by ownCloud by checking the UUID value.</p>
+<p>The same is valid for groups.</p>
+<p>The internal ownCloud name is used all over in ownCloud.
+Clearing the mappings will have leftovers everywhere.
+Never clear the mappings in a production environment.
+Only clear mappings in a test or experimental stage.</p>
- <p><img alt="10000000000003FB000002359BAFB40E_png" src="../_images/10000000000003FB000002359BAFB40E.png" style="width: 6.5in; height: 3.6043in;" /></p>
++<p><img alt="10000000000003FB000002359BAFB40E_png" src="../../_images/10000000000003FB000002359BAFB40E.png" style="width: 6.5in; height: 3.6043in;" /></p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/user_ldap/Introduction.html
index 3ba01d2,0000000..75f9a86
mode 100644,000000..100644
--- a/core/doc/admin/apps/user_ldap/Introduction.html
+++ b/core/doc/admin/apps/user_ldap/Introduction.html
@@@ -1,151 -1,0 +1,151 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud ships an LDAP backend, which allows full use of ownCloud for user logging with LDAP credentials including:</p>
+<ul class="simple">
+<li>LDAP group support</li>
+<li>File sharing with users and groups</li>
+<li>Access via WebDAV and of course ownCloud Desktop Client</li>
+<li>Versioning, external Storages and all other ownCloud features.</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/user_ldap/Table_of_Contents.html
index e0e0117,0000000..2370f33
mode 100644,000000..100644
--- a/core/doc/admin/apps/user_ldap/Table_of_Contents.html
+++ b/core/doc/admin/apps/user_ldap/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374437072>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/user_ldap/index.html
index 9929c97,0000000..c0c7654
mode 100644,000000..100644
--- a/core/doc/admin/apps/user_ldap/index.html
+++ b/core/doc/admin/apps/user_ldap/index.html
@@@ -1,154 -1,0 +1,154 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>LDAP Active Directory Integration</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="CONFIGURATION.html">CONFIGURATION</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="CONFIGURATION.html#enable-ldap-app">Enable LDAP app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="CONFIGURATION.html#configuring-ldap">Configuring LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="CONFIGURATION.html#expert-tab">Expert Tab</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/viewers/Configuration.html
index ce9a6e8,0000000..b0fd883
mode 100644,000000..100644
--- a/core/doc/admin/apps/viewers/Configuration.html
+++ b/core/doc/admin/apps/viewers/Configuration.html
@@@ -1,156 -1,0 +1,156 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="text-editor">
+<h2>Text Editor<a class="headerlink" href="#text-editor" title="Permalink to this headline">¶</a></h2>
+<p>The Text Editor App allows users to view and edit text files.
+To enable this app, navigate to the Apps page and select “Text Editor” then Enable.</p>
- <p><img alt="100000000000012C0000009C444B4720_png" src="../_images/100000000000012C0000009C444B4720.png" style="width: 3.1252in; height: 1.6252in;" /></p>
++<p><img alt="100000000000012C0000009C444B4720_png" src="../../_images/100000000000012C0000009C444B4720.png" style="width: 3.1252in; height: 1.6252in;" /></p>
+</div>
+<div class="section" id="image-viewer">
+<h2>Image Viewer<a class="headerlink" href="#image-viewer" title="Permalink to this headline">¶</a></h2>
+<p>The image viewer app allows users to preview image files within the ownCloud web interface.
+To enable, navigate to the Apps page and select “Image Viewer” then enable.</p>
- <p><img alt="10000000000001400000008A557EF7E3_png" src="../_images/10000000000001400000008A557EF7E3.png" style="width: 3.3335in; height: 1.4374in;" /></p>
++<p><img alt="10000000000001400000008A557EF7E3_png" src="../../_images/10000000000001400000008A557EF7E3.png" style="width: 3.3335in; height: 1.4374in;" /></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/viewers/Introduction.html
index 8fca80d,0000000..938ec58
mode 100644,000000..100644
--- a/core/doc/admin/apps/viewers/Introduction.html
+++ b/core/doc/admin/apps/viewers/Introduction.html
@@@ -1,146 -1,0 +1,146 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud provides apps which allow users to view/edit
+text files and view images which exist on the ownCloud server.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/viewers/Utilization.html
index 00f9951,0000000..314215e
mode 100644,000000..100644
--- a/core/doc/admin/apps/viewers/Utilization.html
+++ b/core/doc/admin/apps/viewers/Utilization.html
@@@ -1,148 -1,0 +1,148 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Utilization — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="utilization">
+<h1>Utilization<a class="headerlink" href="#utilization" title="Permalink to this headline">¶</a></h1>
+<p>When the apps are enabled, select the file name on the web interface Files tab and either the text editor or the image will appear.</p>
- <p><img alt="10000000000001E50000006E3ECDC427_png" src="../_images/10000000000001E50000006E3ECDC427.png" style="width: 5.052in; height: 1.1457in;" /></p>
- <p><img alt="100000000000044C000002B0B421E27E_png" src="../_images/100000000000044C000002B0B421E27E.png" style="width: 6.5in; height: 4.0654in;" /></p>
++<p><img alt="10000000000001E50000006E3ECDC427_png" src="../../_images/10000000000001E50000006E3ECDC427.png" style="width: 5.052in; height: 1.1457in;" /></p>
++<p><img alt="100000000000044C000002B0B421E27E_png" src="../../_images/100000000000044C000002B0B421E27E.png" style="width: 6.5in; height: 4.0654in;" /></p>
+<p>When the apps are disabled, selecting the file name on the web interface will prompt the user to download the specified file.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/apps/viewers/index.html
index e4efc3d,0000000..780bd11
mode 100644,000000..100644
--- a/core/doc/admin/apps/viewers/index.html
+++ b/core/doc/admin/apps/viewers/index.html
@@@ -1,155 -1,0 +1,155 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
++ <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" />
++ <link rel="stylesheet" href="../../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '../',
++ URL_ROOT: '../../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
- <script type="text/javascript" src="../_static/jquery.js"></script>
- <script type="text/javascript" src="../_static/underscore.js"></script>
- <script type="text/javascript" src="../_static/doctools.js"></script>
- <script type="text/javascript" src="../_static/bootstrap.js"></script>
- <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
++ <script type="text/javascript" src="../../_static/jquery.js"></script>
++ <script type="text/javascript" src="../../_static/underscore.js"></script>
++ <script type="text/javascript" src="../../_static/doctools.js"></script>
++ <script type="text/javascript" src="../../_static/bootstrap.js"></script>
++ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
- <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
++ <h1><a href="../../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
- <li><a href="../contents.html">Overview</a></li>
++ <li><a href="../../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
- <li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
- <li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../installation/index.html">Installation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../configuration/index.html">Configuration</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../maintenance/index.html">Maintenance</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Viewers</strong></p>
+<p>Table of Contents</p>
+<p>` <#_Toc376421150>`_</p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#text-editor">Text Editor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Configuration.html#image-viewer">Image Viewer</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Utilization.html">Utilization</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/APPS.html
index cc964a8,0000000..6aae1aa
mode 100644,000000..100644
--- a/core/doc/admin/config/APPS.html
+++ b/core/doc/admin/config/APPS.html
@@@ -1,192 -1,0 +1,192 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>APPS — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="apps">
+<h1>APPS<a class="headerlink" href="#apps" title="Permalink to this headline">¶</a></h1>
+<p>The following parameters are used for ownCloud apps.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="10%" />
+<col width="23%" />
+<col width="67%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Apps Paths</strong></td>
+<td><p class="first">“apps_paths” => array(</p>
+<p>0 => array(</p>
+<p>‘path’=> ‘/var/www/owncloud/apps’,</p>
+<p>‘url’ => ‘/apps’,</p>
+<p>‘writable’ => true,</p>
+<p>),</p>
+<p>1 => array (</p>
+<p>‘path’ =>
+‘/var/www/owncloud/apps2’,</p>
+<p>‘url’ => ‘/apps2’,</p>
+<p>Writable => false,</p>
+<p>),</p>
+<p class="last">),</p>
+</td>
+<td>Use this parameter to set the location of the apps folder which should be scanned for available apps and/or where user specific apps should be installed.
+The path defines the absolute file system path to the app folder.
+The key url defines the http web path to that folder starting at the ownCloud web root.
+The key writable indicates if a user can install apps in that folder.</td>
+</tr>
+<tr class="row-odd"><td><strong>App Store Enabled</strong></td>
+<td>“appstoreenabled” => true,</td>
+<td>When enabled, admins may install apps from the ownCloud app store.</td>
+</tr>
+<tr class="row-even"><td><strong>App Store URL</strong></td>
+<td>“appstoreurl” => “<a class="reference external" href="http://api.apps.owncloud.com/v1">http://api.apps.owncloud.com/v1</a>”,</td>
+<td>The URL of the appstore.</td>
+</tr>
+<tr class="row-odd"><td><strong>App Code Checker</strong></td>
+<td>“appcodechecker” => “”,</td>
+<td>Checks for malicious code fragments of 3
+rd
+party apps.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Code_Locations.html
index 774d4bf,0000000..f149048
mode 100644,000000..100644
--- a/core/doc/admin/config/Code_Locations.html
+++ b/core/doc/admin/config/Code_Locations.html
@@@ -1,191 -1,0 +1,191 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Code Locations — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="code-locations">
+<h1>Code Locations<a class="headerlink" href="#code-locations" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud has the ability to find parts of its code in non-standard locations.
+This section describes how to configure ownCloud for that functionality.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="7%" />
+<col width="34%" />
+<col width="59%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Theme</strong></td>
+<td>“theme” => “”,</td>
+<td>If the instance of ownCloud is themed, the name of the theme should be configured here.
+For more information on this parameter, see the document on Theming.</td>
+</tr>
+<tr class="row-odd"><td><strong>3</strong>
+rd
+** Party Root**</td>
+<td>“3rdpartyroot” => “”,</td>
+<td>ownCloud uses some 3
+rd
+party PHP components to provide certain functionality.
+These components are shipped as part of the software package and reside in
+~/owncloud/3rdparty.
+However, if this folder resides elsewhere, the location can be configured here.
+For example /srv/http/path/to/3rdparty.</td>
+</tr>
+<tr class="row-even"><td><strong>3</strong>
+rd
+** Party URL**</td>
+<td>“3rdpartyurl” => “”,</td>
+<td>In the event that the 3rdpartyroot is configured, this parameter should be configured as well to show the http web path to the 3rdpartyroot starting at the owncloud web root.
+For instance /path/to/3rdparty.</td>
+</tr>
+<tr class="row-odd"><td><strong>Custome Client</strong></td>
+<td><p class="first">‘customclient_desktop’ => ‘’, //<a class="reference external" href="http://owncloud.org/sync-clients/">http://owncloud.org/sync-clients/</a></p>
+<p>‘customclient_android’ => ‘’, //<a class="reference external" href="https://play.google.com/store/apps/details?id=com.owncloud.android">https://play.google.com/store/apps/details?id=com.owncloud.android</a></p>
+<p class="last">‘customclient_ios’ => ‘’, //<a class="reference external" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8">https://itunes.apple.com/us/app/owncloud/id543672169?mt=8</a></p>
+</td>
+<td>The location where ownCloud will bring the user to download clients.
+The link is in the first run wizard or the Personal page.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Default_Parameters.html
index 5ead79f,0000000..47b68de
mode 100644,000000..100644
--- a/core/doc/admin/config/Default_Parameters.html
+++ b/core/doc/admin/config/Default_Parameters.html
@@@ -1,219 -1,0 +1,219 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Default Parameters — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="default-parameters">
+<h1>Default Parameters<a class="headerlink" href="#default-parameters" title="Permalink to this headline">¶</a></h1>
+<p>The following parameters are automatically configured by ownCloud upon the initial admin login.
+These parameters are mandatory for the ownCloud instance to operate properly.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="9%" />
+<col width="12%" />
+<col width="79%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Debug</strong></td>
+<td>define(“DEBUG”, true);</td>
+<td>When set to true, additional information is written to the logs.
+This is to be used only for local development and not in a production environment.</td>
+</tr>
+<tr class="row-odd"><td><strong>Installed</strong></td>
+<td>“installed” => false,</td>
+<td>This flag indicates whether the ownCloud instance was installed successfully.
+When set to true, the install was successful.
+When set to false the instance is not properly installed.</td>
+</tr>
+<tr class="row-even"><td><strong>DB Type</strong></td>
+<td>“dbtype” => “sqlite”,</td>
+<td>The dbtype indicates what type of database is being used with this install.</td>
+</tr>
+<tr class="row-odd"><td><strong>DB Name</strong></td>
+<td>“dbname” => “owncloud”,</td>
+<td>The ownCloud database within the SQL instance.
+ownCloud database configuration guides use “owncloud” in the instructions, it is the default for this field.
+This may be set to any valid table name.
+If the table doesn’t exist, the setup will attempt to create it, provided it has proper permissions.</td>
+</tr>
+<tr class="row-even"><td><strong>DB User</strong></td>
+<td>“dbuser” => “”,</td>
+<td>This is the user that ownCloud uses to write to the databse.
+This must be unique across ownCloud instances using the same SQL database.
+The user will be created when the install wizard is complete.
+Since the database user in the initial login screen has admin privileges (root), ownCloud creates a new user to ensure ownCloud does not run with unnecessary database permissions.
+ownCloud prefixes “<a href="#id1"><span class="problematic" id="id2">oc_</span></a>” to the userid to prevent a collision between the ownCloud admin user and any existing database users.
+This is generated at the time of the initial login and is the Admin User as entered by the ownCloud admin.</td>
+</tr>
+<tr class="row-odd"><td><strong>DB Password</strong></td>
+<td>“dbpassword” => “”,</td>
+<td>When a new database user is created for ownCloud, a password for the database is generated by hashing the admin user password.
+This hash is stored in this parameter.</td>
+</tr>
+<tr class="row-even"><td><strong>DB Host</strong></td>
+<td>“dbhost” => “”,</td>
+<td>This parameter shows the location of the database.
+Can be an IP pointing to the database server, a Fully Qualified Domain Name (FQDN) or localhost.</td>
+</tr>
+<tr class="row-odd"><td><strong>DB Table Prefix</strong></td>
+<td>“dbtableprefix” => “<a href="#id3"><span class="problematic" id="id4">oc_</span></a>”,</td>
+<td>All tables in the database will begin with this prefix.
+By default the prefix is “<a href="#id5"><span class="problematic" id="id6">oc_</span></a>”.
+If this prefix is changed in the config file, the tables in the database will need to be manually renamed.
+ownCloud will not detect a change to this option so changing this prefix without manually renaming the tables will break the instance of ownCloud.</td>
+</tr>
+<tr class="row-even"><td><strong>Password Salt</strong></td>
+<td>“passwordsalt” => “”,</td>
+<td>This is the salt used to hash passwords within the ownCloud instance.
+It is important not to remove or lose this password.
+If lost, all passwords within the ownCloud instance will be lost.</td>
+</tr>
+<tr class="row-odd"><td><strong>Data Directory</strong></td>
+<td>“datadirectory” => “”,</td>
+<td>This parameter tells ownCloud where the default data directory is located.
+It is configured in the installation wizard.
+If using SQLITE, the database is stored in this data directory as well.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Deleted_Items.html
index 29e7470,0000000..534f996
mode 100644,000000..100644
--- a/core/doc/admin/config/Deleted_Items.html
+++ b/core/doc/admin/config/Deleted_Items.html
@@@ -1,167 -1,0 +1,167 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Deleted Items — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="deleted-items">
+<h1>Deleted Items<a class="headerlink" href="#deleted-items" title="Permalink to this headline">¶</a></h1>
+<p>These parameters are related to the deleted files app.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="15%" />
+<col width="23%" />
+<col width="62%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Trash Bin Rentention</strong></td>
+<td>‘trashbin_retention_obligation’ => 30,</td>
+<td>When the delete app is enabled (default), this is the amount of days a file will be kept in the trash bin.
+Default is 30 days.</td>
+</tr>
+<tr class="row-odd"><td><strong>Trash Bin Auto Expire</strong></td>
+<td>‘trashbin_auto_expire’ => true,</td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Introduction.html
index 3f5ba82,0000000..f106398
mode 100644,000000..100644
--- a/core/doc/admin/config/Introduction.html
+++ b/core/doc/admin/config/Introduction.html
@@@ -1,149 -1,0 +1,149 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud uses a configuration file to set certain parameters.
+The configuration file is entitled config.php and resides in the ~/owncloud/config directory.
+Also residing in that directory is a sample configuration file entitled config.sample.php.
+This file lists all the configurable parameters within ownCloud along with a brief description.
+This document will provide more details as to what each parameter is used for.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Logging.html
index 15bb312,0000000..a7710c9
mode 100644,000000..100644
--- a/core/doc/admin/config/Logging.html
+++ b/core/doc/admin/config/Logging.html
@@@ -1,207 -1,0 +1,207 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Logging — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="logging">
+<h1>Logging<a class="headerlink" href="#logging" title="Permalink to this headline">¶</a></h1>
+<p>This section describes parameters associated with ownCloud’s logging abilities.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="10%" />
+<col width="25%" />
+<col width="65%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Log Type</strong></td>
+<td>“log_type” => “owncloud”,</td>
+<td>By default the ownCloud logs are sent to the owncloud.log file within the default data directory.
+If syslogging is desired, set this parameter to syslog.</td>
+</tr>
+<tr class="row-odd"><td><strong>Log File</strong></td>
+<td>“logfile” => “”,</td>
+<td>The log file, by default, is owncloud.log and stored in the default data directory.
+Use this parameter to change the name to something other than owncloud.log.</td>
+</tr>
+<tr class="row-even"><td><strong>Log Level</strong></td>
+<td>“loglevel” => “”,</td>
+<td>ownCloud has several levels of logging.
+This may be set on the Admin page of the webUI or directly in the configuration file using this parameter.
+Valid values are: 0=Debug, 1=Info, 2=Warning, 3=Error.
+The default value is Warning</td>
+</tr>
+<tr class="row-odd"><td><strong>Log Date Format</strong></td>
+<td>‘logdateformat’ => ‘F d, Y H:i:s’,</td>
+<td>ownCloud allows the admin to specify the format of the time and date within the log file.
+Valid values may be found at the following website:
+<a class="reference external" href="http://www.php.net/manual/en/function.date.php">http://www.php.net/manual/en/function.date.php</a>
+.</td>
+</tr>
+<tr class="row-even"><td><strong>Log Time Zone</strong></td>
+<td>‘logtimezone’ => ‘Europe/Berlin’,</td>
+<td>By default, the time zone displayed in the ownCloud logs is UTC.
+To change the displayed time zone to the local time zone, use this parameter.
+For a list of valid values, see the following website:
+<a class="reference external" href="http://php.net/manual/en/timezones.php">http://php.net/manual/en/timezones.php</a>
+.</td>
+</tr>
+<tr class="row-odd"><td><strong>Log Query</strong></td>
+<td>“log_query” => false,</td>
+<td>When set to “true”, all SQL queries performed by ownCloud will be written to the log file.
+Default is false.
+It is not recommended to run with this enabled as it will fill up the log file.
+Use only for debugging purposes.</td>
+</tr>
+<tr class="row-even"><td><strong>Log Auth Fail IP</strong></td>
+<td>“log_authfailip” => false,</td>
+<td>When set to true, the IP addresses of failed login attempts will be logged.</td>
+</tr>
+<tr class="row-odd"><td><strong>Log Rotate Size</strong></td>
+<td>‘log_rotate_size’ => false, // 104857600, // 100 MiB</td>
+<td>Since ownCloud log files can get large in size, this parameter may be used to rotate to a new log file once it reaches the specified size.
+This should be configured in bytes.
+Default is false, or 0, which will not rotate the file.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Mail_Parameters.html
index 258b712,0000000..fe80b4f
mode 100644,000000..100644
--- a/core/doc/admin/config/Mail_Parameters.html
+++ b/core/doc/admin/config/Mail_Parameters.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Mail Parameters — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="mail-parameters">
+<h1>Mail Parameters<a class="headerlink" href="#mail-parameters" title="Permalink to this headline">¶</a></h1>
+<p>These parameters are related to ownCloud’s ability to send emails for lost passwords or file shares.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Maintenance.html
index c5f57ee,0000000..71634bd
mode 100644,000000..100644
--- a/core/doc/admin/config/Maintenance.html
+++ b/core/doc/admin/config/Maintenance.html
@@@ -1,169 -1,0 +1,169 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Maintenance — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="maintenance">
+<h1>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h1>
+<p>This section discusses the different stages of maintenance.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="12%" />
+<col width="18%" />
+<col width="70%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Single User</strong></td>
+<td>‘singleuser’ => false,</td>
+<td>When set to true, the ownCloud instance will be unavailable for all users not in the admin group.
+This is useful when performing maintenance.</td>
+</tr>
+<tr class="row-odd"><td><strong>Maintenance</strong></td>
+<td>“maintenance” => false,</td>
+<td>Enable maintenance mode to disable ownCloud.
+When performing upgrades, ownCloud automatically enters maintenance mode.
+When enabled, users who are already logged-in are kicked out of ownCloud instantly.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Miscellaneous.html
index 712fadf,0000000..99e8bd5
mode 100644,000000..100644
--- a/core/doc/admin/config/Miscellaneous.html
+++ b/core/doc/admin/config/Miscellaneous.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Miscellaneous — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="miscellaneous">
+<h1>Miscellaneous<a class="headerlink" href="#miscellaneous" title="Permalink to this headline">¶</a></h1>
+<p>The remaining parameters are listed below.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Previews.html
index 377aedb,0000000..7d2ec1a
mode 100644,000000..100644
--- a/core/doc/admin/config/Previews.html
+++ b/core/doc/admin/config/Previews.html
@@@ -1,188 -1,0 +1,188 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Previews — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="previews">
+<h1>Previews<a class="headerlink" href="#previews" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud allows for thumbnail previews of files.
+This section contains the different configuration parameters available for that functionality.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="18%" />
+<col width="36%" />
+<col width="46%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Enable Previews</strong></td>
+<td>‘enable_previews’ => true,</td>
+<td>When enabled, default, the user will have file thumbnails visible.
+Disable to remove thumbnails.</td>
+</tr>
+<tr class="row-odd"><td><strong>Preview Width</strong></td>
+<td>‘preview_max_x’ => null,</td>
+<td>Maximum width of the thumbnail.
+Default is null meaning no limit.</td>
+</tr>
+<tr class="row-even"><td><strong>Preview Height</strong></td>
+<td>‘preview_max_y’ => null,</td>
+<td>The maximum height of the thumbnail.
+Default is set to null meaning no limit.</td>
+</tr>
+<tr class="row-odd"><td><strong>Scale Factor</strong></td>
+<td>‘preview_max_scale_factor’ => 10,</td>
+<td>Scale the thumbnail by this factor.
+Default is 10.</td>
+</tr>
+<tr class="row-even"><td><strong>Libreoffice Path</strong></td>
+<td>‘preview_libreoffice_path’ => ‘/usr/bin/libreoffice’,</td>
+<td>ownCloud uses Libre Office for previews.
+This parameter indicates the location of the Libre Office executable.</td>
+</tr>
+<tr class="row-odd"><td><strong>Libreoffice Parameters</strong></td>
+<td>‘preview_office_cl_parameters’ => ‘’,</td>
+<td>Use this if Libre Office requires additional arguments</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Reverse_Proxy_Configurations.html
index 99cde15,0000000..1ddec1a
mode 100644,000000..100644
--- a/core/doc/admin/config/Reverse_Proxy_Configurations.html
+++ b/core/doc/admin/config/Reverse_Proxy_Configurations.html
@@@ -1,199 -1,0 +1,199 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Reverse Proxy Configurations — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="reverse-proxy-configurations">
+<h1>Reverse Proxy Configurations<a class="headerlink" href="#reverse-proxy-configurations" title="Permalink to this headline">¶</a></h1>
+<p>The following parameters are used in the instance that Proxies are being used within the network.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="9%" />
+<col width="14%" />
+<col width="78%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Overwrite Host</strong></td>
+<td>“overwritehost” => “”,</td>
+<td><p class="first">By default, ownCloud attempts to detect what outside host can access the instance (www.example.com
+) for generating URLs.
+However, due to some reverse proxies, the automatically detected value may be incorrect (www.example.com:88) which would lead to incorrect URLs being generated.
+Use this field to enter the proper URL.</p>
+<p>If set as follows: “overwritehost” => “<a class="reference external" href="http://www.example.com:88">http://www.example.com:88</a>”,</p>
+<p class="last">When logging into ownCloud, the browser will point to port 88.</p>
+</td>
+</tr>
+<tr class="row-odd"><td><strong>Overwrite Protocol</strong></td>
+<td>“overwriteprotocol” => “”,</td>
+<td><p class="first">When generating URLs, ownCloud attempts to detect whether the server is accessed via https or http.
+However, if ownCloud is behind a proxy and the proxy handles the https calls, thereby leaving ownCloud running without SSL, ownCloud would not realize that ssl is in use which would result in incorrect URLs being generated.
+Valid values are “http” and “https”.</p>
+<p>If set as follows:</p>
+<p>“overwriteprotocol” => “https”,</p>
+<p class="last">ownCloud will generate all URLs as HTTPS rather than HTTP.</p>
+</td>
+</tr>
+<tr class="row-even"><td><strong>Overwrite Web Root</strong></td>
+<td>“overwritewebroot” => “”,</td>
+<td>As with the host and protocol, ownCloud attempts to detect the webroot for generating URLs automatically.
+The webroot is the path used to access ownCloud relative to the domain, for instance, if
+<a class="reference external" href="http://www.example.com/owncloud">www.example.com/owncloud</a>
+is the URL pointing to the ownCloud instance, the webroot would be /owncloud.
+When proxies are in use, it may be difficult for ownCloud to detect this parameter resulting in invalid URLs.</td>
+</tr>
+<tr class="row-odd"><td><strong>Overwrite Cond Addr</strong></td>
+<td>“overwritecondaddr” => “”,</td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><strong>Proxy</strong></td>
+<td>“proxy” => “”,</td>
+<td>In the instance where a proxy is required to access the internet, the proxy should be configured in this parameter.
+ownCloud requires access to the internet for several functions, and thus needs to have the proxy information configured to access the internet.</td>
+</tr>
+<tr class="row-odd"><td><strong>Proxy User Password</strong></td>
+<td>“proxyuserpwd” => “username:password”,</td>
+<td>In the event that a proxy is configured and requires authentication, the username and password would be configured in this parameter.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Session_Info.html
index ebc1c03,0000000..b53dac1
mode 100644,000000..100644
--- a/core/doc/admin/config/Session_Info.html
+++ b/core/doc/admin/config/Session_Info.html
@@@ -1,172 -1,0 +1,172 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Session Info — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="session-info">
+<h1>Session Info<a class="headerlink" href="#session-info" title="Permalink to this headline">¶</a></h1>
+<p>The following parameters are related to sessions within ownCloud.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="22%" />
+<col width="65%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Remember Cookie Lifetime</strong></td>
+<td>“remember_login_cookie_lifetime” => 60*60*24*15,</td>
+<td>ownCloud provides the user the option of remembering their login credentials (this option appears as the “remember” checkbox on the login screen).
+This parameter allows the admin to configure the length of time which ownCloud will remember that user.
+Default is 15 days.
+The configuration is in seconds.</td>
+</tr>
+<tr class="row-odd"><td><strong>Session Lifetime</strong></td>
+<td>“session_lifetime” => 60 * 60 * 24,</td>
+<td>ownCloud will automatically logout a user after a period of inactivity.
+The default is 1 day.
+This parameter can be used to modify that time.
+Configuration is in seconds.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Table_of_Contents.html
index aeffb7d,0000000..f4ad579
mode 100644,000000..100644
--- a/core/doc/admin/config/Table_of_Contents.html
+++ b/core/doc/admin/config/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc377032819>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/User_Experience.html
index cb51a19,0000000..16bab55
mode 100644,000000..100644
--- a/core/doc/admin/config/User_Experience.html
+++ b/core/doc/admin/config/User_Experience.html
@@@ -1,185 -1,0 +1,185 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>User Experience — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="user-experience">
+<h1>User Experience<a class="headerlink" href="#user-experience" title="Permalink to this headline">¶</a></h1>
+<p>The following parameters are those that influence the end user’s experience.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="14%" />
+<col width="23%" />
+<col width="63%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Default Language</strong></td>
+<td>“default_language” => “en”,</td>
+<td>This is the default language for the ownCloud WebUI. When configured, the default language will be the same for all users.
+Users may then configure their own language preference in their Personal page.
+When not configured, the default language is determined form the headers sent by the web browser.
+For instance, if the browser is in Spanish, ownCloud will be presented in Spanish</td>
+</tr>
+<tr class="row-odd"><td><strong>Default App</strong></td>
+<td>“defaultapp” => “files”,</td>
+<td>By default, when a user logs into ownCloud, they are brought to the files page.
+If, for instance, the admin desires a different page to be loaded upon login, configure that app here.
+Valid values are app id’s (for example news, files, gallery).</td>
+</tr>
+<tr class="row-even"><td><strong>Knowledge Base Enabled</strong></td>
+<td>“knowledgebaseenabled” => true,</td>
+<td>When enabled, default, the help menu brings up the user documentation.</td>
+</tr>
+<tr class="row-odd"><td><strong>Enable Avatars</strong></td>
+<td>‘enable_avatars’ => true,</td>
+<td>Allows for the ability to use avatars.</td>
+</tr>
+<tr class="row-even"><td><strong>Display Name</strong></td>
+<td>‘allow_user_to_change_display_name’ => true,</td>
+<td>Users can modify their display name in the Personal page.
+If this parameter is set to false, they may not change their display
+name.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/Verification.html
index c34bafc,0000000..0354f78
mode 100644,000000..100644
--- a/core/doc/admin/config/Verification.html
+++ b/core/doc/admin/config/Verification.html
@@@ -1,180 -1,0 +1,180 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Verification — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="verification">
+<h1>Verification<a class="headerlink" href="#verification" title="Permalink to this headline">¶</a></h1>
+<p>This section describes different verification checks that ownCloud may perform.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="16%" />
+<col width="21%" />
+<col width="63%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Parameter</strong></td>
+<td><strong>Format</strong></td>
+<td><strong>Description</strong></td>
+</tr>
+<tr class="row-even"><td><strong>Update Checker</strong></td>
+<td>“updatechecker” => true,</td>
+<td>Provides information as to whether there is a new release of ownCloud available.
+When enabled, default, a banner will appear on the admin’s web interface when a newer version of ownCloud exists.</td>
+</tr>
+<tr class="row-odd"><td><strong>Has Internet Connection</strong></td>
+<td>“has_internet_connection” => true,</td>
+<td>Alerts ownCloud if there is an internet connection (true – default).
+If set to false, ownCloud will not be able to look for updates, display the knowledgebase, or bring up the appstore.</td>
+</tr>
+<tr class="row-even"><td><strong>Working WebDAV</strong></td>
+<td>“check_for_working_webdav” => true,</td>
+<td>Allows ownCloud to verify a working WebDAV connection.
+This is done by attempting to make a WebDAV request from PHP.</td>
+</tr>
+<tr class="row-odd"><td><strong>Working .htaccess</strong></td>
+<td>“check_for_working_htaccess” => true,</td>
+<td>Verifies whether the .htaccess file may be modified by ownCloud.
+If set to false, this check will not be performed.
+If the file cannot be modified, items such as large file uploads cannot be performed.
+This check only affects Apache servers.</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/config/index.html
index fd4bd63,0000000..f186da8
mode 100644,000000..100644
--- a/core/doc/admin/config/index.html
+++ b/core/doc/admin/config/index.html
@@@ -1,161 -1,0 +1,161 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud config.php</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Default_Parameters.html">Default Parameters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Reverse_Proxy_Configurations.html">Reverse Proxy Configurations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="User_Experience.html">User Experience</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Mail_Parameters.html">Mail Parameters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Deleted_Items.html">Deleted Items</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Verification.html">Verification</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Logging.html">Logging</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Session_Info.html">Session Info</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Code_Locations.html">Code Locations</a></li>
+<li class="toctree-l1"><a class="reference internal" href="APPS.html">APPS</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Previews.html">Previews</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Maintenance.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Miscellaneous.html">Miscellaneous</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/auth_ldap.html
index 39aaa1b,0000000..2e38708
mode 100644,000000..100644
--- a/core/doc/admin/configuration/auth_ldap.html
+++ b/core/doc/admin/configuration/auth_ldap.html
@@@ -1,783 -1,0 +1,784 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>User Authentication with LDAP — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Background Jobs" href="background_jobs.html" />
+ <link rel="prev" title="User Management" href="configuration_users.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">User Authentication with LDAP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#advanced-settings">Advanced Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#expert-settings">Expert Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#testing-the-configuration">Testing the configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#microsoft-active-directory">Microsoft Active Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#duplicating-server-configurations">Duplicating Server Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#groups">Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#user-and-group-mapping">User and Group Mapping</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#caching">Caching</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#handling-with-backup-server">Handling with Backup Server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="user-authentication-with-ldap">
+<h1>User Authentication with LDAP<a class="headerlink" href="#user-authentication-with-ldap" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud ships an LDAP backend, which allows full use of ownCloud for user
+logging in with LDAP credentials including:</p>
+<ul class="simple">
+<li>LDAP group support</li>
+<li>File sharing with users and groups</li>
+<li>Access via WebDAV and of course ownCloud Desktop Client</li>
+<li>Versioning, external Storages and all other ownCloud goodies</li>
+</ul>
+<p>To connect to an LDAP server the configuration needs to be set up properly.
+Once the LDAP backend is activated (Apps Sidebar→Apps, choose <strong>LDAP user and
+group backend</strong>, click on <strong>Enable</strong>) the configuration can be found on
+Settings→Admin. Read on for a detailed description of the configuration fields.</p>
+<div class="section" id="configuration">
+<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
+<p>The LDAP backend follows a wizard-like approach, splitted into four tabs. A
+correctly completed first tab (“Server”) is mandatory to access the other tabs.
+Also, the other tabs need to be reviewed by the admin, however the necessary
+settings are detected automatically. An indicator will show whether the
+configuration is incomplete, incorrect or OK.</p>
+<p>The settings are changed automatically, as soon as a input element looses the
+focus, i.e. the cursor is taken away by clicking somewhere else or pressing the
+tabulator key.</p>
+<p>The other tabs can be navigated by clicking the tabs or by using the <em>Continue</em>
+and <em>Back</em> buttons. They are located on the lower right, next to the status
+indicator.</p>
+<div class="section" id="server">
+<h3>Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h3>
+<p>The server tab contains the basic information on the LDAP server. They make sure
+that ownCloud will be able to connect to LDAP and be able to read data from
+there. The admin at least needs to provide a hostname. If anonymous access is
+not possible he will need to provide an account DN and a password, too. ownCloud
+attempts to auto-detect the port and the base DN.</p>
+<div class="figure">
+<img alt="../_images/ldap-wizard-1-server.png" src="../_images/ldap-wizard-1-server.png" />
+</div>
+<dl class="docutils">
+<dt>Server configuration:</dt>
+<dd>ownCloud can be configured to connect to multiple LDAP servers. Using this
+control you can pick a configuration you want to edit or add a new one. The
+button <strong>Delete Configuration</strong> deletes the current configuration.</dd>
+<dt>Host:</dt>
+<dd><p class="first">The host name of the LDAP server. It can also be a <strong>ldaps://</strong> URI, for
+instance.</p>
+<p>It is also possible to pass a port number, which speeds up port detection. It
+is especially useful, if a custom port is used. ownCloud will move the value
+to the port field subsequently.</p>
+<p>Examples:</p>
+<ul class="last simple">
+<li><em>directory.my-company.com</em></li>
+<li><em>ldaps://directory.my-company.com</em></li>
+<li><em>directory.my-company.com:9876</em></li>
+</ul>
+</dd>
+<dt>Port:</dt>
+<dd><p class="first">The port on which to connect to the LDAP server. The field is disabled in the
+beginning of a new configuration. The port will be detected automatically,
+if the LDAP server is running on a standard port. After ownCloud attempted to
+determine the port, the field will be enabled for user input. A successfully
+found port will be inserted by ownCloud, of course.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>389</em></li>
+</ul>
+</dd>
+<dt>User DN:</dt>
+<dd><p class="first">The name as DN of a user who is able to do searches in the LDAP
+directory. Leave it empty for anonymous access. It is recommended to have a
+special system user for ownCloud.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>uid=owncloudsystemuser,cn=sysusers,dc=my-company,dc=com</em></li>
+</ul>
+</dd>
+<dt>Password:</dt>
+<dd>The password for the user given above. Empty for anonymous access.</dd>
+<dt>Base DN:</dt>
+<dd><p class="first">The base DN of LDAP, from where all users and groups can be reached. Separated
+Base DNs for users and groups can be set in the Advanced tab. Nevertheless,
+this field is mandatory. ownCloud attempts to determine the Base DN according
+to the provided User DN or the provided Host.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>dc=my-company,dc=com</em></li>
+</ul>
+</dd>
+</dl>
+</div>
+<div class="section" id="user-filter">
+<h3>User Filter<a class="headerlink" href="#user-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in the user filter tab determine which LDAP users will appear and
+are allowed to log in into ownCloud. It is also possible to enter a raw LDAP
+filter.</p>
+<div class="figure">
+<img alt="../_images/ldap-wizard-2-user.png" src="../_images/ldap-wizard-2-user.png" />
+</div>
+<dl class="docutils">
+<dt>only those object classes:</dt>
+<dd>ownCloud will determine the object classes that are typically availalble for
+(ideally only) user objects in your LDAP. ownCloud will automatically select
+the object class that returns the highest amount of users. You can select
+multiple object classes.</dd>
+<dt>only from those groups:</dt>
+<dd><p class="first">If your LDAP server supports the member-of-overlay in LDAP filters, you can
+define that only users from one or more certain groups are allowed to
+appear and log in into ownCloud. By default, no value will be selected. You
+can select multiple groups.</p>
+<p class="last">If your LDAP server does not support the member-of-overlay in LDAP filters,
+the input field is disabled. Please contact your LDAP administrator.</p>
+</dd>
+<dt>Edit raw filter instead:</dt>
+<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
+approach, you can enter the raw LDAP filter directly in the appearing field.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>objectClass=inetOrgPerson</em></li>
+</ul>
+</dd>
+<dt>x users found:</dt>
+<dd>This is an indicator that tells you approximately how many users will be
+allowed to access ownCloud. The number will update after any change you do.</dd>
+</dl>
+</div>
+<div class="section" id="login-filter">
+<h3>Login Filter<a class="headerlink" href="#login-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in the login filter tab determine which user detail will be
+compared to the login value entered by the user. It is possible to allow
+multiple user details. It is also possible to enter a raw LDAP filter.</p>
+<p>The user limitation as set up in the previous tab is in effect, unless you
+manually configure the filter in raw mode.</p>
+<div class="figure">
+<img alt="../_images/ldap-wizard-3-login.png" src="../_images/ldap-wizard-3-login.png" />
+</div>
+<dl class="docutils">
+<dt>LDAP Username:</dt>
+<dd>If this value is checked, the login value will be compared to the username in
+the LDAP directory. The corresponding attribute, usually <em>uid</em> or
+<em>samaccountname</em> will be detected automatically by ownCloud.</dd>
+<dt>LDAP Email Address:</dt>
+<dd>If this value is checked, the login value will be compared to an email address
+in the LDAP directory. The email address will be looked for in the
+<em>mailPrimaryAddress</em> and <em>mail</em> attributes.</dd>
+<dt>Other Attributes:</dt>
+<dd>This multiselect box allows you to select other attributes for the comparison.
+The list is generated automatically based on the attributes that a user object
+contains in your LDAP server.</dd>
+<dt>Edit raw filter instead:</dt>
+<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
+approach, you can enter the raw LDAP filter directly in the appearing field.</p>
+<p>The <strong>%uid</strong> placeholder will be replaced with the login name entered by the user
+upon login. When you enter the filter manually.</p>
+<p>Examples:</p>
+<ul class="last simple">
+<li>only username: <em>uid=%uid</em></li>
+<li>username or email address: <em>(|(uid=%uid)(mail=$uid))</em></li>
+</ul>
+</dd>
+</dl>
+</div>
+<div class="section" id="group-filter">
+<h3>Group Filter<a class="headerlink" href="#group-filter" title="Permalink to this headline">¶</a></h3>
+<p>The settings in the group filter tab determine which groups will be availalble
+in ownCloud. It does not have any restrictions on logins, this has been dealed
+with in the prior tabs. It is also possible to enter a raw LDAP
+filter.</p>
+<p>By default, no groups will be availalble in ownCloud. You actively need to
+enable groups.</p>
+<div class="figure">
+<img alt="../_images/ldap-wizard-4-group.png" src="../_images/ldap-wizard-4-group.png" />
+</div>
+<dl class="docutils">
+<dt>only those object classes:</dt>
+<dd>ownCloud will determine the object classes that are typically availalble for
+(ideally only) group objects in your LDAP. ownCloud will only list object
+classes that return at least one group object. You can select multiple
+object classes. A typical object class is “group”, or “posixGroup”.</dd>
+<dt>only from those groups:</dt>
+<dd>This setting lets you pick certain groups that shall be availalble in
+ownCloud. This field follows a whitelist approach. ownCloud will generate a
+list of available groups found in your LDAP server. You can select multiple
+groups.</dd>
+<dt>Edit raw filter instead:</dt>
+<dd><p class="first">Clicking on this text will toggle the filter mode. Instead of the assisted
+approach, you can enter the raw LDAP filter directly in the appearing field.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>objectClass=group</em></li>
+<li><em>objectClass=posixGroup</em></li>
+</ul>
+</dd>
+<dt>y groups found:</dt>
+<dd>This is an indicator that tells you approximately how many groups will be
+available in ownCloud. The number will update after any change you do.</dd>
+</dl>
+</div>
+</div>
+<div class="section" id="advanced-settings">
+<h2>Advanced Settings<a class="headerlink" href="#advanced-settings" title="Permalink to this headline">¶</a></h2>
+<p>In the LDAP Advanced settings section you can define options, that are less
+common to set. They are not needed for a working connection. It can also have a
+positive effect on the performance to specify distinguished bases for user and
+group searches.</p>
+<p>The Advanced Settings are structured into three parts:</p>
+<ul class="simple">
+<li>Connection Settings</li>
+<li>Directory Settings</li>
+<li>Special Attributes</li>
+</ul>
+<div class="section" id="connection-settings">
+<h3>Connection Settings<a class="headerlink" href="#connection-settings" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/ldap-advanced-1-connection.png" src="../_images/ldap-advanced-1-connection.png" />
+<p class="caption">LDAP Advanced Settings, section Connection Settings</p>
+</div>
+<dl class="docutils">
+<dt>Configuration Active:</dt>
+<dd><p class="first">Enables or Disables the current configuration. Disabled configuration will not
+connect to the LDAP server.</p>
+<p class="last">By default, it is turned off. It will be automatically turned on, when using
+the wizard and the configuration is OK and a test connection successful.</p>
+</dd>
+<dt>Backup (Replica) Host:</dt>
+<dd><p class="first">A backup server can be defined here. ownCloud tries to connect to the backup
+server automatically, when the main host (as specified in basic settings)
+cannot be reached. It is import that the backup server is a replica of the
+main server, because the object UUIDs must match.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>directory2.my-company.com</em></li>
+</ul>
+</dd>
+<dt>Backup (Replica) Port:</dt>
+<dd><p class="first">The port on which to connect to the backup LDAP server. If no port is given,
+but a host, then the main port (as specified above) will be used.</p>
+<p>Example:</p>
+<ul class="last simple">
+<li><em>389</em></li>
+</ul>
+</dd>
+<dt>Disable Main Server:</dt>
+<dd>You can manually override the main server and make ownCloud only connect to
+the backup server. It may be handy for planned downtimes.</dd>
+<dt>Case insensitive LDAP server (Windows):</dt>
+<dd>Whether the LDAP server is running on a Windows Host. Usually, it is not
+necessary to check it, however.</dd>
+<dt>Turn off SSL certificate validation:</dt>
+<dd>Turns of check of valid SSL certificates. Use it – if needed –
+for testing, only!</dd>
+<dt>Cache Time-To-Live:</dt>
+<dd><p class="first">A cache is introduced to avoid unnecessary LDAP traffic,
+for example lookups check whether the users exists on every page request or
+WebDAV interaction. It is also supposed to speed up the Admin → User page or
+list of users to share with, once it is populated. Saving the configuration
+empties the cache (changes are not necessary). The time is given in seconds.</p>
+<p>Note that almost every PHP request would require to build up a new connection
+to the LDAP server. If you require a most up-to-dateness it is recommended not
+to totally switch off the cache, but define a minimum life time of 15s.</p>
+<p>Examples:</p>
+<ul class="last simple">
+<li>ten minutes: <em>600</em></li>
+<li>one hour: <em>3600</em></li>
+</ul>
+</dd>
+</dl>
+</div>
+<div class="section" id="directory-settings">
+<h3>Directory Settings<a class="headerlink" href="#directory-settings" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/ldap-advanced-2-directory.png" src="../_images/ldap-advanced-2-directory.png" />
+<p class="caption">LDAP Advanced Settings, section Directory Settings</p>
+</div>
+<dl class="docutils">
+<dt>User Display Name Field:</dt>
+<dd><p class="first">The attribute that should be used as display name in ownCloud.</p>
+<ul class="last simple">
+<li>Example: <em>displayName</em></li>
+</ul>
+</dd>
+<dt>Base User Tree:</dt>
+<dd><p class="first">The base DN of LDAP, from where all users can be reached. It needs to be given
+completely despite to the Base DN from the Basic settings. You can specify
+multiple base trees, one in each line.</p>
+<ul class="last">
+<li><p class="first">Example:</p>
+<div class="line-block">
+<div class="line"><em>cn=programmers,dc=my-company,dc=com</em></div>
+<div class="line"><em>cn=designers,dc=my-company,dc=com</em></div>
+</div>
+</li>
+</ul>
+</dd>
+<dt>User Search Attributes:</dt>
+<dd><p class="first">These attributes are used when a search for users is done. This happens, for
+instance, in the share dialogue. By default the user display name attribute as
+specified above is being used. Multiple attributes can be given, one in each
+line.</p>
+<p>Beware that if an attribute is not available on a user object, the user will
+neither be listed (e.g. in the share dialogue) nor be able to login. This also
+affects the display name attribute as specified above. If you override the
+default, the display name attribute will not be taken into account, unless you
+specify it as well.</p>
+<ul class="last">
+<li><p class="first">Example:</p>
+<div class="line-block">
+<div class="line"><em>displayName</em></div>
+<div class="line"><em>mail</em></div>
+</div>
+</li>
+</ul>
+</dd>
+<dt>Group Display Name Field:</dt>
+<dd><p class="first">The attribute that should be used as ownCloud group name. ownCloud allows a
+limited set of characters (a-zA-Z0-9.-_@), every other character will be
+replaced in ownCloud. Once a group name is assigned, it will not be changed,
+i.e. changing this value will only have effect to new LDAP groups.</p>
+<ul class="last simple">
+<li>Example: <em>cn</em></li>
+</ul>
+</dd>
+<dt>Base Group Tree:</dt>
+<dd><p class="first">The base DN of LDAP, from where all groups can be reached.
+It needs to be given completely despite to the Base DN from the Basic
+settings. You can specify multiple base trees, one in each line.</p>
+<ul class="last">
+<li><p class="first">Example:</p>
+<div class="line-block">
+<div class="line"><em>cn=barcelona,dc=my-company,dc=com</em></div>
+<div class="line"><em>cn=madrid,dc=my-company,dc=com</em></div>
+</div>
+</li>
+</ul>
+</dd>
+<dt>Group Search Attributes:</dt>
+<dd><p class="first">These attributes are used when a search for groups is done. This happens, for
+instance, in the share dialogue. By default the group display name attribute
+as specified above is being used. Multiple attributes can be given, one in
+each line.</p>
+<p>If you override the default, the group display name attribute will not be
+taken into account, unless you specify it as well.</p>
+<ul class="last">
+<li><p class="first">Example:</p>
+<div class="line-block">
+<div class="line"><em>cn</em></div>
+<div class="line"><em>description</em></div>
+</div>
+</li>
+</ul>
+</dd>
+<dt>Group Member association:</dt>
+<dd><p class="first">The attribute that is used to indicate group memberships, i.e. the attribute
+used by LDAP groups to refer to their users.</p>
+<p>ownCloud detects the value automatically, you should only change it, if you
+have a very valid reason and know what you are doing.</p>
+<ul class="last simple">
+<li>Example: <em>uniquemember</em></li>
+</ul>
+</dd>
+</dl>
+</div>
+<div class="section" id="special-attributes">
+<h3>Special Attributes<a class="headerlink" href="#special-attributes" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/ldap-advanced-3-attributes.png" src="../_images/ldap-advanced-3-attributes.png" />
+<p class="caption">LDAP Advanced Settings, section Special Attributes</p>
+</div>
+<dl class="docutils">
+<dt>Quota Field:</dt>
+<dd><p class="first">ownCloud can read an LDAP attribute and set the user quota according to its
+value. Specify the attribute here, otherwise keep it empty. The attribute
+shall return human readable values, e.g. “2 GB”.</p>
+<ul class="last simple">
+<li>Example: <em>ownCloudQuota</em></li>
+</ul>
+</dd>
+<dt>Quota Default:</dt>
+<dd><p class="first">Override ownCloud default quota for LDAP users who do not
+have a quota set in the attribute given above.</p>
+<ul class="last simple">
+<li>Example: <em>15 GB</em></li>
+</ul>
+</dd>
+<dt>Email Field:</dt>
+<dd><p class="first">ownCloud can read an LDAP attribute and set the user email
+there from. Specify the attribute here, otherwise keep it empty.</p>
+<p>Although the wizard offers you to check login by email, the correct email
+attribute is not detected and you need to specify it manually.</p>
+<ul class="last simple">
+<li>Example: <em>mail</em></li>
+</ul>
+</dd>
+<dt>User Home Folder Naming Rule:</dt>
+<dd><p class="first">By default, the ownCloud creates the user
+directory, where all files and meta data are kept, according to the ownCloud
+user name. You may want to override this setting and name it after an
+attribute value. The attribute given can also return an absolute path, e.g.
+<tt class="docutils literal"><span class="pre">/mnt/storage43/alice</span></tt>. Leave it empty for default behavior.</p>
+<ul class="last simple">
+<li>Example: <em>cn</em></li>
+</ul>
+</dd>
+</dl>
+</div>
+</div>
+<div class="section" id="expert-settings">
+<h2>Expert Settings<a class="headerlink" href="#expert-settings" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="../_images/ldap-expert.png" src="../_images/ldap-expert.png" />
+</div>
+<p>In the Expert Settings fundamental behavior can be adjusted to your needs. The
+configuration should be done before starting production use or when testing the
+installation.</p>
+<dl class="docutils">
+<dt>Internal Username:</dt>
+<dd><p class="first">The internal username is the identifier in ownCloud for LDAP users. By default
+it will be created from the UUID attribute. By using the UUID attribute it is
+made sure that the username is unique and characters do not need to be
+converted. The internal username has the restriction that only these
+characters are allowed: [a-zA-Z0-9_.@-]. Other characters are replaced with
+their ASCII correspondence or are simply omitted.</p>
+<p>The LDAP backend ensures that there are no duplicate internal usernames in
+ownCloud, i.e. that it is checking all other activated user backends
+(including local ownCloud users). On collisions a random number (between 1000
+and 9999) will be attached to the retrieved value. For example, if “alice”
+exists, the next username may be “alice_1337”.</p>
+<p>The internal username is also the default name for the user home folder in
+ownCloud. It is also a part of remote URLs, for instance for all *DAV services.
+With this setting the default behaviour can be overridden.</p>
+<p>Leave it empty for default behaviour. Changes will have effect only on newly
+mapped (added) LDAP users.</p>
+<ul class="last simple">
+<li>Example: <em>uid</em></li>
+</ul>
+</dd>
+<dt>Override UUID detection</dt>
+<dd><p class="first">By default, ownCloud auto-detects the UUID attribute. The UUID attribute is
+used to doubtlessly identify LDAP users and groups. Also, the internal
+username will be created based on the UUID, if not specified otherwise above.</p>
+<p>You can override the setting and pass an attribute of your choice. You must
+make sure that the attribute of your choice can be fetched for both users and
+groups and it is unique. Leave it empty for default behaviour. Changes will
+have effect only on newly mapped (added) LDAP users and groups. It also will
+have effect when a user’s or group’s DN changes and an old UUID was cached: It
+will result in a new user. Because of this, the setting should be applied
+before putting ownCloud in production use and cleaning the bindings
+(see below).</p>
+<ul class="last simple">
+<li>Example: <em>cn</em></li>
+</ul>
+</dd>
+<dt>Username-LDAP User Mapping</dt>
+<dd><p class="first">ownCloud uses the usernames as key to store and assign data. In order to
+precisely identify and recognize users, each LDAP user will have a internal
+username in ownCloud. This requires a mapping from ownCloud username to LDAP
+user. The created username is mapped to the UUID of the LDAP user.
+Additionally the DN is cached as well to reduce LDAP interaction, but it is
+not used for identification. If the DN changes, the change will be detected by
+ownCloud by checking the UUID value.</p>
+<p>The same is valid for groups.</p>
+<p>The internal ownCloud name is used all over in ownCloud. Clearing the Mappings
+will have leftovers everywhere. Do never clear the mappings
+in a production environment. Only clear mappings in a testing or experimental
+stage.</p>
+<p class="last"><strong>Clearing the Mappings is not configuration sensitive, it affects all LDAP
+configurations!</strong></p>
+</dd>
+</dl>
+</div>
+<div class="section" id="testing-the-configuration">
+<h2>Testing the configuration<a class="headerlink" href="#testing-the-configuration" title="Permalink to this headline">¶</a></h2>
+<p>In this version we introduced the <strong>Test Configuration</strong> button on the bottom
+of the LDAP settings section. It will always check the values as currently
+given in the input fields. You do not need to save before testing. By clicking
+on the button, ownCloud will try to bind to the ownCloud server with the
+settings currently given in the input fields. The response will look like this:</p>
+<div class="figure">
+<img alt="../_images/ldap-settings-invalid-oc45.png" src="../_images/ldap-settings-invalid-oc45.png" />
+<p class="caption">Failure</p>
+</div>
+<p>In case the configuration fails, you can see details in ownCloud’s log, which
+is in the data directory and called <strong>owncloud.log</strong> or on the bottom the
+<strong>Settings → Admin page</strong>. Unfortunately it requires a reload – sorry for the
+inconvenience.</p>
+<div class="figure">
+<img alt="../_images/ldap-settings-valid-oc45.png" src="../_images/ldap-settings-valid-oc45.png" />
+<p class="caption">Success</p>
+</div>
+<p>In this case, Save the settings. You can check if the users and groups are
+fetched correctly on the Settings → Users page.</p>
+</div>
+<div class="section" id="owncloud-avatar-integration">
+<h2>ownCloud Avatar integration<a class="headerlink" href="#owncloud-avatar-integration" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud 6 incorporates a user profile picture feature, called Avatar. If a user
- has a photo stored in the <em>jpegPhoto</em> attribute, it will be used as Avatar. The
- user then is not able to change his avatar in the personal settings. It must be
- done within LDAP.</p>
++has a photo stored in the <em>jpegPhoto</em> or, since 6.0.2, <em>thumbnailPhoto</em>
++attribute, it will be used as Avatar. The user then is not able to change his
++avatar in the personal settings. It must be done within LDAP. <em>jpegPhoto</em> is
++preferred over <em>thumbnailPhoto</em>.</p>
+<div class="figure">
+<img alt="../_images/ldap-fetched-avatar.png" src="../_images/ldap-fetched-avatar.png" />
+<p class="caption">Profile picture fetched from LDAP, Personal Settings</p>
+</div>
- <p>If the <em>jpegPhoto</em> attribute is not set or empty, the default ownCloud behaviour
- is active, i.e. the user will be able to set and change his profile picture in
- the personal settings. If the user sets a profile picture within ownCloud it
- will _not_ be stored in LDAP.</p>
- <p>The <em>jpegPhoto</em> attribute will be fetched once a day to make sure the current
- photo from LDAP is used in ownCloud. If a picture is added later, a possibly set
- profile picture will be overridden with the LDAP one. If a photo stored in the
- <em>jpegPhoto</em> attribute is deleted later, the last profile picture in ownCloud
- will still be used.</p>
++<p>If the <em>jpegPhoto</em> or <em>thumbnailPhoto</em> attribute is not set or empty, the
++default ownCloud behaviour is active, i.e. the user will be able to set and
++change his profile picture in the personal settings. If the user sets a profile
++picture within ownCloud it will _not_ be stored in LDAP.</p>
++<p>The <em>jpegPhoto</em> or <em>thumbnailPhoto</em> attribute will be fetched once a day to make
++sure the current photo from LDAP is used in ownCloud. If a picture is added
++later, a possibly set profile picture will be overridden with the LDAP one. If a
++photo stored in the <em>jpegPhoto</em> and/or <em>thumbnailPhoto</em> attribute is deleted
++later, the last profile picture in ownCloud will still be used.</p>
+<p>The photo taken from LDAP will be adjusted to the requirements of the ownCloud
+avatar automatically. I.e. it will be transformed into a square. If the photo
+needs to be cut, it will be done equally from both affected sides. The original
+photo stored in LDAP will stay the same, of course.</p>
+</div>
+<div class="section" id="troubleshooting-tips-and-tricks">
+<h2>Troubleshooting, Tips and Tricks<a class="headerlink" href="#troubleshooting-tips-and-tricks" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="ssl-certificate-verification-ldaps-tls">
+<h2>SSL Certificate Verification (LDAPS, TLS)<a class="headerlink" href="#ssl-certificate-verification-ldaps-tls" title="Permalink to this headline">¶</a></h2>
+<p>A common mistake with SSL certificates is that they may not be known to PHP.
+If you have trouble with certificate validation make sure that</p>
+<ul class="simple">
+<li>you have the certificate of the server installed on the ownCloud server</li>
+<li>the certificate is announced in the system’s LDAP configuration file (usually
+<em>/etc/ldap/ldap.conf</em> on Linux, <em>C:\openldap\sysconf\ldap.conf</em> or
+<em>C:\ldap.conf</em> on Windows) using a <strong>TLS_CACERT /path/to/cert</strong> line.</li>
+<li>Using LDAPS, also make sure that the port is correctly configured (by default
+686)</li>
+</ul>
+</div>
+<div class="section" id="microsoft-active-directory">
+<h2>Microsoft Active Directory<a class="headerlink" href="#microsoft-active-directory" title="Permalink to this headline">¶</a></h2>
+<p>Compared to earlier ownCloud versions, no further tweaks need to be done to
+make ownCloud work with Active Directory. ownCloud will automatically find the
+correct configuration in the wizard-like set up process.</p>
+</div>
+<div class="section" id="duplicating-server-configurations">
+<h2>Duplicating Server Configurations<a class="headerlink" href="#duplicating-server-configurations" title="Permalink to this headline">¶</a></h2>
+<p>In case you have a working configuration and want to create a similar one or
+“snapshot” configurations before modifying them you can do the following:</p>
+<ol class="arabic simple">
+<li>Go to the <strong>Server</strong> tab</li>
+<li>On <strong>Server Configuration</strong> choose <em>Add Server Configuration</em></li>
+<li>Answer the question <em>Take over settings from recent server configuration?</em>
+with <em>yes</em>.</li>
+<li>(optional) Switch to <strong>Advanced</strong> tab and uncheck <strong>Configuration Active</strong>
+in the <em>Connection Settings</em>, so the new configuration is not used on Save</li>
+<li>Click on <strong>Save</strong></li>
+</ol>
+<p>Now you can modify the configuration and enable it if you wish.</p>
+</div>
+<div class="section" id="owncloud-ldap-internals">
+<h2>ownCloud LDAP Internals<a class="headerlink" href="#owncloud-ldap-internals" title="Permalink to this headline">¶</a></h2>
+<p>Some parts of how the LDAP backend works are described here. May it be helpful.</p>
+</div>
+<div class="section" id="groups">
+<h2>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h2>
+<p>At the moment, only secondary groups are read. That means that only the groups
+are retrieved, which are returned by the attribute auto-detected (or manually
+chosen) in Group-Member association. Primary groups are not being taken into
+account.</p>
+</div>
+<div class="section" id="user-and-group-mapping">
+<h2>User and Group Mapping<a class="headerlink" href="#user-and-group-mapping" title="Permalink to this headline">¶</a></h2>
+<p>In ownCloud the user or group name is used to have all relevant information in
+the database assigned. To work reliably a permanent internal user name and
+group name is created and mapped to the LDAP DN and UUID. If the DN changes in
+LDAP it will be detected, there will be no conflicts.</p>
+<p>Those mappings are done in the database table ldap_user_mapping and
+ldap_group_mapping. The user name is also used for the user’s folder (except
+something else is specified in <em>User Home Folder Naming Rule</em>), which
+contains files and meta data.</p>
+<p>As of ownCloud 5 internal user name and a visible display name are separated.
+This is not the case for group names, yet, i.e. group cannot be altered.</p>
+<p>That means that your LDAP configuration should be good and ready before putting
+it into production. The mapping tables are filled early, but as long as you are
+testing, you can empty the tables any time. Do not do this in production. If you
+want to rename a group, be very careful. Do not rename the user’s internal name.</p>
+</div>
+<div class="section" id="caching">
+<h2>Caching<a class="headerlink" href="#caching" title="Permalink to this headline">¶</a></h2>
+<p>For performance reasons a cache has been introduced to ownCloud. He we store
+all users and groups, group memberships or internal userExists-requests. Since
+ownCloud is written in PHP and each and every page request (also done by Ajax)
+loads ownCloud and would execute one or more LDAP queries again, you do want to
+have some of those queries cached and save those requests and traffic. It is
+highly recommended to have the cache filled for a small amount of time, which
+comes also very handy when using the sync client, as it is yet another request
+for PHP.</p>
+</div>
+<div class="section" id="handling-with-backup-server">
+<h2>Handling with Backup Server<a class="headerlink" href="#handling-with-backup-server" title="Permalink to this headline">¶</a></h2>
+<p>When ownCloud is not able to contact the main server, he will be treated as
+offline and no connection attempts will be done for the time specified in
+<strong>Cache Time-To-Live</strong>. If a backup server is configured, it will be connected
+instead. If you plan a maintained downtime, check <strong>Disable Main Server</strong> for
+the time being to avoid unnecessary connection attempts every now and then.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/background_jobs.html
index 08be0e4,0000000..e08cafb
mode 100644,000000..100644
--- a/core/doc/admin/configuration/background_jobs.html
+++ b/core/doc/admin/configuration/background_jobs.html
@@@ -1,227 -1,0 +1,227 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Background Jobs — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="3rd-Party Configuration" href="configuration_3rdparty.html" />
+ <link rel="prev" title="User Authentication with LDAP" href="auth_ldap.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#cron-jobs">Cron-Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="background-jobs">
+<h1>Background Jobs<a class="headerlink" href="#background-jobs" title="Permalink to this headline">¶</a></h1>
+<p>A system like ownCloud sometimes requires tasks to be done on a regular
+base without blocking the user interface. For that purpose you, as a system
+administrator, can define background jobs which make it possible to execute
+tasks without any need of user interaction, e.g. database clean-ups etc.
+For the sake of completeness it is worth to know that additionally background
+jobs can also be defined by installed apps.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>In the admin settings menu you can configure how cron-jobs should be executed.
+You can choose between the following options:</p>
+<ul class="simple">
+<li>AJAX</li>
+<li>Webcron</li>
+<li>Cron</li>
+</ul>
+</div>
+<div class="section" id="cron-jobs">
+<h2>Cron-Jobs<a class="headerlink" href="#cron-jobs" title="Permalink to this headline">¶</a></h2>
+<p>OwnCloud requires various automated background jobs to be run. There are three methods to achieve this.
+The default way is AJAX and the recommended way is cron.</p>
+<div class="section" id="ajax">
+<h3>AJAX<a class="headerlink" href="#ajax" title="Permalink to this headline">¶</a></h3>
+<p>This option is the default option, although it is the least reliable. Every
+time a user visits the ownCloud page a single background job will be executed.
+The advantage of this mechanism is, that is does not require access to the
+system nor registration at a third party service.
+The disadvantage of this solution compared to the Webcron service is, that it
+requires regular visits of the page to get triggered.</p>
+</div>
+<div class="section" id="webcron">
+<h3>Webcron<a class="headerlink" href="#webcron" title="Permalink to this headline">¶</a></h3>
+<p>By registering your ownCloud <tt class="docutils literal"><span class="pre">cron.php</span></tt> script address at an external webcron
+service, like e.g. <a class="reference external" href="http://www.easycron.com/">easyCron</a>, you ensure that background jobs will be executed
+regularly. To use such a service your server need to be reachable via the Internet.</p>
+<p><strong>Example</strong></p>
+<div class="highlight-python"><pre>URL to call: http[s]://<domain-of-your-server>/owncloud/cron.php</pre>
+</div>
+</div>
+<div class="section" id="cron">
+<h3>Cron<a class="headerlink" href="#cron" title="Permalink to this headline">¶</a></h3>
+<p>Using the systems cron feature is the preferred way to run regular tasks,
+because it allows to execute jobs without the limitations which a web server
+may have.</p>
+<p><strong>Example</strong></p>
+<p>To run a cron job on a *nix system, e.g. every 15min, under the default web server
+user, e.g. <strong>www-data</strong>, you need to set-up the following cron job to call the
+<strong>cron.php</strong> script. Please check the crontab man page for the exact command syntax.</p>
+<div class="highlight-python"><pre># crontab -u www-data -e
+*/15 * * * * php -f /var/www/owncloud/cron.php</pre>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_3rdparty.html
index cd12690,0000000..546a718
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_3rdparty.html
+++ b/core/doc/admin/configuration/configuration_3rdparty.html
@@@ -1,189 -1,0 +1,189 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>3rd-Party Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Automatic Configuration" href="configuration_automation.html" />
+ <link rel="prev" title="Background Jobs" href="background_jobs.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">3rd-Party Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="rd-party-configuration">
+<h1>3rd-Party Configuration<a class="headerlink" href="#rd-party-configuration" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud resorts to some 3rd-party PHP components to provide its functionality.
+These components are part of the software package and are usually shipped in
+the <strong>/3rdparty</strong> folder.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>If you want to change the default location of the 3rd-party folder you can use the <strong>3rdpartyroot</strong> parameter to define
+the absolute file system path to the folder. The <strong>3rdpartyurl</strong> parameter is used to define the http web path to that
+folder, starting at the ownCloud web root.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"3rdpartyroot"</span> <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/3rdparty"</span><span class="p">,</span>
+<span class="s2">"3rdpartyurl"</span> <span class="o">=></span> <span class="s2">"/3rdparty"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_apps.html
index aa19336,0000000..77e0001
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_apps.html
+++ b/core/doc/admin/configuration/configuration_apps.html
@@@ -1,247 -1,0 +1,247 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Apps Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="User Management" href="configuration_users.html" />
+ <link rel="prev" title="Configuration" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Apps Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="apps-configuration">
+<h1>Apps Configuration<a class="headerlink" href="#apps-configuration" title="Permalink to this headline">¶</a></h1>
+<p>After you have installed ownCloud, you might realize that it would be nice to
+provide an additional function on top of the core functionality in your ownCloud installation.</p>
+<p>With ownCloud installation, you will find some apps enabled by default. To see which applications
+are enabled, click on Apps button on the web interface navigation to go into applications page:</p>
+<div class="figure">
+<img alt="../_images/oc_admin_app_page.png" src="../_images/oc_admin_app_page.png" />
+</div>
+<p>Administrator application page</p>
+<p>In this page, you can enable or disable applications simply by clicking on their names.
+Enabled applications will be shown in <strong>bold</strong> while disabled ones will be shown in normal font.
+If the app is not developed by ownCloud, it will have the <em>3rd party</em> notice next to it. To see what an
+application does, clicking on its name will show a description on the right side of the same page.</p>
+<p>To install new apps, you can use <em>More apps</em> button or check out the <a class="reference external" href="http://apps.owncloud.com/">ownCloud apps store</a>.
+There you will find a lot of ready-to-use apps provided by the ownCloud community.</p>
+<p>If you would like to add your own app, please use <em>Add your App...</em> button on the same page. This will redirect you to
+our <a class="reference external" href="http://owncloud.org/dev">Developer Center</a>.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>Parameters are set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> inside the <strong>$CONFIG</strong> array.</p>
+<div class="section" id="use-custom-app-directories">
+<h3>Use custom app directories<a class="headerlink" href="#use-custom-app-directories" title="Permalink to this headline">¶</a></h3>
+<p>Use the <strong>apps_paths</strong> array to set the apps folders which should be scanned
+for available apps and/or where user specific apps should be installed.The key
+<strong>path</strong> defines the absolute file system path to the app folder. The key
+<strong>url</strong> defines the http web path to that folder, starting at the ownCloud
+web root. The key <strong>writable</strong> indicates if a user can install apps in that
+folder.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you want to make sure that the default <strong>/apps/</strong> folder only contains apps shipped with ownCloud, you
+should follow the example and set-up a <strong>/apps2/</strong> folder which will be used to store all apps downloaded by users</p>
+</div>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"apps_paths"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"path"</span> <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/apps"</span><span class="p">,</span>
+ <span class="s2">"url"</span> <span class="o">=></span> <span class="s2">"/apps"</span><span class="p">,</span>
+ <span class="s2">"writable"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+ <span class="p">),</span>
+ <span class="mi">1</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"path"</span> <span class="o">=></span> <span class="nx">OC</span><span class="o">::</span><span class="nv">$SERVERROOT</span><span class="o">.</span><span class="s2">"/apps2"</span><span class="p">,</span>
+ <span class="s2">"url"</span> <span class="o">=></span> <span class="s2">"/apps2"</span><span class="p">,</span>
+ <span class="s2">"writable"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
+ <span class="p">),</span>
+ <span class="p">),</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="use-your-own-appstore">
+<h3>Use your own appstore<a class="headerlink" href="#use-your-own-appstore" title="Permalink to this headline">¶</a></h3>
+<p>If you want to allow the installation of apps from the apps store you have to
+set <strong>appstoreenabled</strong> parameter, but this can only be done if at least one
+of the configured apps directories is writable.</p>
+<p>The <strong>appstoreurl</strong> is used to set the http path to the ownCloud apps store. The appstore server has to use <abbr title="Open Collaboration Services">OCS</abbr>.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"appstoreenabled"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
+ <span class="s2">"appstoreurl"</span> <span class="o">=></span> <span class="s2">"http://api.apps.owncloud.com/v1"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="guard-against-malicious-3rdparty-code">
+<h3>Guard against malicious 3rdparty code<a class="headerlink" href="#guard-against-malicious-3rdparty-code" title="Permalink to this headline">¶</a></h3>
+<p>Finally you can enable checks for malicious code fragments of 3rd-party apps
+by setting the <strong>appcodechecker</strong> parameter.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"appcodechecker"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_automation.html
index 7df175b,0000000..18f4292
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_automation.html
+++ b/core/doc/admin/configuration/configuration_automation.html
@@@ -1,286 -1,0 +1,286 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Automatic Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Custom Client Configuration" href="configuration_custom_clients.html" />
+ <link rel="prev" title="3rd-Party Configuration" href="configuration_3rdparty.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Automatic Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sample-automatic-configurations">Sample Automatic Configurations</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="automatic-configuration">
+<h1>Automatic Configuration<a class="headerlink" href="#automatic-configuration" title="Permalink to this headline">¶</a></h1>
+<p>If you need to install ownCloud on multiple servers you normally do not want
+to set-up each instance separately as described in the <a class="reference internal" href="configuration_database.html"><em>Database Configuration</em></a>.
+For this reason the automatic configuration feature has been introduced.</p>
+<p>To take advantage of this feature you need to create a configuration file, called
+<tt class="file docutils literal"><span class="pre">../owncloud/config/autoconfig.php</span></tt> and set the parameters as required.
+You can provide all parameters or just part of them - parameters which haven’t been provided (if any) will be asked
+at “Finish setup” screen at first run of ownCloud.</p>
+<p>The <tt class="file docutils literal"><span class="pre">../owncloud/config/autoconfig.php</span></tt> will be automatically removed after the initial configuration has been applied.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>You need to keep in mind that two parameters are named differently in this
+configuration file compared to the normal <tt class="file docutils literal"><span class="pre">config.php</span></tt>.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="52%" />
+<col width="48%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">autoconfig.php</th>
+<th class="head">config.php</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>directory</td>
+<td>datadirectory</td>
+</tr>
+<tr class="row-odd"><td>dbpass</td>
+<td>dbpassword</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="sample-automatic-configurations">
+<h2>Sample Automatic Configurations<a class="headerlink" href="#sample-automatic-configurations" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="data-directory">
+<h3>Data Directory<a class="headerlink" href="#data-directory" title="Permalink to this headline">¶</a></h3>
+<p>With the configuration below the “Finish setup” screen still will ask for database and admin credentials settings.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+ <span class="s2">"directory"</span> <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="sqlite-database">
+<h3>SQLite Database<a class="headerlink" href="#sqlite-database" title="Permalink to this headline">¶</a></h3>
+<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"sqlite"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="mysql-database">
+<h3>MySQL Database<a class="headerlink" href="#mysql-database" title="Permalink to this headline">¶</a></h3>
+<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
+in advance, as described in <a class="reference internal" href="configuration_database.html"><em>Database Configuration</em></a>.</p>
+<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"dbpass"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="postgresql-database">
+<h3>PostgreSQL Database<a class="headerlink" href="#postgresql-database" title="Permalink to this headline">¶</a></h3>
+<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
+in advance, as described in <a class="reference internal" href="configuration_database.html"><em>Database Configuration</em></a>.</p>
+<p>With the configuration below the “Finish setup” screen still will ask for data directory and admin credentials settings.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"pgsql"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"dbpass"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="all-parameters">
+<h3>All Parameters<a class="headerlink" href="#all-parameters" title="Permalink to this headline">¶</a></h3>
+<p>Keep in mind that the automatic configuration does not unburden you from creating the database user and database
+in advance, as described in <a class="reference internal" href="configuration_database.html"><em>Database Configuration</em></a>.</p>
+<p>With the configuration below “Finish setup” will be skipped at first ownCloud run since all parameters are already preconfigured.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$AUTOCONFIG</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"dbpass"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"adminlogin"</span> <span class="o">=></span> <span class="s2">"root"</span><span class="p">,</span>
+ <span class="s2">"adminpass"</span> <span class="o">=></span> <span class="s2">"root-password"</span><span class="p">,</span>
+ <span class="s2">"directory"</span> <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_custom_clients.html
index a7a0162,0000000..f10d581
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_custom_clients.html
+++ b/core/doc/admin/configuration/configuration_custom_clients.html
@@@ -1,196 -1,0 +1,196 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Custom Client Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Database Configuration" href="configuration_database.html" />
+ <link rel="prev" title="Automatic Configuration" href="configuration_automation.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Custom Client Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="custom-client-configuration">
+<h1>Custom Client Configuration<a class="headerlink" href="#custom-client-configuration" title="Permalink to this headline">¶</a></h1>
+<p>If you want to access your ownCloud, you can choose between the standard Web-GUI
+and different client sync applications. Download links which point to these
+applications are shown at the top of the personal menu. The following sync
+applications are currently available out of the box:</p>
+<ul class="simple">
+<li>Desktop sync clients for Windows, Max and Linux OS</li>
+<li>Mobile sync client for Android devices</li>
+<li>Mobile sync client for iOS devices</li>
+</ul>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>If you want to customize the download links for the sync clients the following
+parameters need to be modified to fulfil your requirements:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"customclient_desktop"</span> <span class="o">=></span> <span class="s2">"http://owncloud.org/sync-clients/"</span><span class="p">,</span>
+ <span class="s2">"customclient_android"</span> <span class="o">=></span> <span class="s2">"https://play.google.com/store/apps/details?id=com.owncloud.android"</span><span class="p">,</span>
+ <span class="s2">"customclient_ios"</span> <span class="o">=></span> <span class="s2">"https://itunes.apple.com/us/app/owncloud/id543672169?mt=8"</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_database.html
index 9f1404a,0000000..4a3cb82
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_database.html
+++ b/core/doc/admin/configuration/configuration_database.html
@@@ -1,486 -1,0 +1,486 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Database Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Use Server-Side Encryption" href="configuration_encryption.html" />
+ <link rel="prev" title="Custom Client Configuration" href="configuration_custom_clients.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Database Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#trouble-shooting">Trouble Shooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="database-configuration">
+<h1>Database Configuration<a class="headerlink" href="#database-configuration" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud requires a database where administrative data will be held. Four different database types are currently
+supported, <a class="reference external" href="http://www.mysql.com/">MySQL</a>, <a class="reference external" href="https://mariadb.org/">MariaDB</a>, <a class="reference external" href="http://www.sqlite.org/">SQLite</a>,
+and <a class="reference external" href="http://www.postgresql.org/">PostgreSQL</a>. MySQL or MariaDB are the recommended database engines. By default
+SQLite is chosen because it is a file based database with the least administrative overhead.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Because SQLite handles multiple users very badly SQLite is only recommended for single user ownCloud installations</p>
+</div>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<p>If you decide to use MySQL, MariaDB, or PostgreSQL you need to install and set-up the
+database first. These steps will not be covered by this description as they are easy to find elsewhere.</p>
+</div>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="mysql-mariadb-database">
+<h3>MySQL/MariaDB Database<a class="headerlink" href="#mysql-mariadb-database" title="Permalink to this headline">¶</a></h3>
+<p>If you decide to use a MySQL or MariaDB database make sure that you have installed and
+enabled the MySQL extension in PHP and that the <strong>mysql.default_socket</strong>
+points to the correct socket (if the database runs on same server as ownCloud).</p>
+<p>Please note that MariaDB is backwards compatible with MySQL, so all instructions will work for both.
+You will not need to replace mysql with anything.</p>
+<p>The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/mysql.ini</span></tt> could look like this:</p>
+<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP MySQL module</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">pdo_mysql.so</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">mysql.so</span>
+
+<span class="k">[mysql]</span>
+<span class="na">mysql.allow_local_infile</span><span class="o">=</span><span class="s">On</span>
+<span class="na">mysql.allow_persistent</span><span class="o">=</span><span class="s">On</span>
+<span class="na">mysql.cache_size</span><span class="o">=</span><span class="s">2000</span>
+<span class="na">mysql.max_persistent</span><span class="o">=</span><span class="s">-1</span>
+<span class="na">mysql.max_links</span><span class="o">=</span><span class="s">-1</span>
+<span class="na">mysql.default_port</span><span class="o">=</span>
+<span class="na">mysql.default_socket</span><span class="o">=</span><span class="s">/var/lib/mysql/mysql.sock # Debian squeeze: /var/run/mysqld/mysqld.sock</span>
+<span class="na">mysql.default_host</span><span class="o">=</span>
+<span class="na">mysql.default_user</span><span class="o">=</span>
+<span class="na">mysql.default_password</span><span class="o">=</span>
+<span class="na">mysql.connect_timeout</span><span class="o">=</span><span class="s">60</span>
+<span class="na">mysql.trace_mode</span><span class="o">=</span><span class="s">Off</span>
+</pre></div>
+</div>
+<p>Now you need to create a database user and the database itself by using the
+MySQL command line interface. The database tables will be created by ownCloud
+when you login for the first time.</p>
+<p>To start the MySQL command line mode use:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">uroot</span> <span class="o">-</span><span class="n">p</span>
+</pre></div>
+</div>
+<p>Then a <strong>mysql></strong> or <strong>MariaDB [root]></strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
+<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="s1">'username'</span><span class="o">@</span><span class="s1">'localhost'</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">'password'</span><span class="p">;</span>
+<span class="k">CREATE</span> <span class="k">DATABASE</span> <span class="n">IF</span> <span class="k">NOT</span> <span class="k">EXISTS</span> <span class="n">owncloud</span><span class="p">;</span>
+<span class="k">GRANT</span> <span class="k">ALL</span> <span class="k">PRIVILEGES</span> <span class="k">ON</span> <span class="n">owncloud</span><span class="p">.</span><span class="o">*</span> <span class="k">TO</span> <span class="s1">'username'</span><span class="o">@</span><span class="s1">'localhost'</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">'password'</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>You can quit the prompt by entering:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">quit</span>
+</pre></div>
+</div>
+<p>In the ownCloud configuration you need to set the hostname on which the
+database is running and a valid username and password to access it.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"mysql"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"dbpassword"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="sqlite-database">
+<h3>SQLite Database<a class="headerlink" href="#sqlite-database" title="Permalink to this headline">¶</a></h3>
+<p>If you decide to use a SQLite database make sure that you have installed and
+enabled the SQLite extension in PHP. The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/sqlite3.ini</span></tt> could look like this:</p>
+<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP SQLite3 module</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">pdo_sqlite.so</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">sqlite3.so</span>
+</pre></div>
+</div>
+<p>It is not necessary to create a database and a database user in advance
+because this will automatically be done by ownCloud when you login for the
+first time.</p>
+<p>In the ownCloud configuration in <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> you need to set at least the <strong>datadirectory</strong> parameter to
+the directory where your data and database should be stored. Note that for the PDO SQLite driver this directory must
+be writable (this is recommended for ownCloud anyway). No authentication is required to access the database therefore
+most of the default parameters could be taken as is:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"sqlite"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dbpassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"datadirectory"</span> <span class="o">=></span> <span class="s2">"/www/htdocs/owncloud/data"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="postgresql-database">
+<h3>PostgreSQL Database<a class="headerlink" href="#postgresql-database" title="Permalink to this headline">¶</a></h3>
+<p>If you decide to use a PostgreSQL database make sure that you have installed
+and enabled the PostgreSQL extension in PHP. The PHP configuration in <tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/pgsql.ini</span></tt> could look
+like this:</p>
+<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP PostgreSQL module</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">pdo_pgsql.so</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">pgsql.so</span>
+
+<span class="k">[PostgresSQL]</span>
+<span class="na">pgsql.allow_persistent</span> <span class="o">=</span> <span class="s">On</span>
+<span class="na">pgsql.auto_reset_persistent</span> <span class="o">=</span> <span class="s">Off</span>
+<span class="na">pgsql.max_persistent</span> <span class="o">=</span> <span class="s">-1</span>
+<span class="na">pgsql.max_links</span> <span class="o">=</span> <span class="s">-1</span>
+<span class="na">pgsql.ignore_notice</span> <span class="o">=</span> <span class="s">0</span>
+<span class="na">pgsql.log_notice</span> <span class="o">=</span> <span class="s">0</span>
+</pre></div>
+</div>
+<p>Now you need to create a database user and the database itself by using the
+PostgreSQL command line interface. The database tables will be created by
+ownCloud when you login for the first time.</p>
+<p>To start the postgres command line mode use:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">psql</span> <span class="o">-</span><span class="n">hlocalhost</span> <span class="o">-</span><span class="n">Upostgres</span>
+</pre></div>
+</div>
+<p>Then a <strong>postgres=#</strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
+<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="n">username</span> <span class="k">WITH</span> <span class="n">PASSWORD</span> <span class="s1">'password'</span><span class="p">;</span>
+<span class="k">CREATE</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">TEMPLATE</span> <span class="n">template0</span> <span class="k">ENCODING</span> <span class="s1">'UNICODE'</span><span class="p">;</span>
+<span class="k">ALTER</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">OWNER</span> <span class="k">TO</span> <span class="n">username</span><span class="p">;</span>
+<span class="k">GRANT</span> <span class="k">ALL</span> <span class="k">PRIVILEGES</span> <span class="k">ON</span> <span class="k">DATABASE</span> <span class="n">owncloud</span> <span class="k">TO</span> <span class="n">username</span><span class="p">;</span>
+</pre></div>
+</div>
+<p>You can quit the prompt by entering:</p>
+<div class="highlight-python"><pre>\q</pre>
+</div>
+<p>In the ownCloud configuration you need to set the hostname on which the
+database is running and a valid username (and sometimes a password) to
+access it. If the database has been installed on the same server as
+ownCloud a password is very often not required to access the database.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"pgsql"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"dbpassword"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+ <span class="s2">"dbtableprefix"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="oracle-database">
+<h3>Oracle Database<a class="headerlink" href="#oracle-database" title="Permalink to this headline">¶</a></h3>
+<p>If you are deploying to an Oracle database make sure that you have installed
+and enabled the <a class="reference external" href="http://php.net/manual/en/book.oci8.php">Oracle extension</a> in PHP. The PHP configuration in
+<tt class="file docutils literal"><span class="pre">/etc/php5/conf.d/oci8.ini</span></tt> could look like this:</p>
+<div class="highlight-ini"><div class="highlight"><pre><span class="c"># configuration for PHP Oracle extension</span>
+<span class="na">extension</span><span class="o">=</span><span class="s">oci8.so</span>
+</pre></div>
+</div>
+<p>Make sure that the Oracle environment has been set up for the process trying to use the Oracle extension.
+For a local Oracle XE installation this can be done by exporting the following environment variables
+(eg. in <tt class="file docutils literal"><span class="pre">/etc/apache2/envvars</span></tt> for Apache)</p>
+<div class="highlight-bash"><div class="highlight"><pre><span class="nb">export </span><span class="nv">ORACLE_HOME</span><span class="o">=</span>/u01/app/oracle/product/11.2.0/xe
+<span class="nb">export </span><span class="nv">LD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$LD_LIBRARY_PATH</span>:<span class="nv">$ORACLE_HOME</span>/lib
+</pre></div>
+</div>
+<p>Installing and configuring Oracle support for PHP is way out of scope for this document.
+The official Oracle documentation called <a class="reference external" href="http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html">The Underground PHP and Oracle Manual</a>
+should help you through the process.</p>
+<p>Creating a database user for ownCloud can be done by using the sqlplus command line interface
+or the Oracle Application Express web interface.
+The database tables will be created by ownCloud when you login for the first time.</p>
+<p>To start the Oracle command line mode with a DBA account use:</p>
+<div class="highlight-python"><pre>sqlplus system AS SYSDBA</pre>
+</div>
+<p>After entering the password a <strong>SQL></strong> prompt will appear. Now enter the following lines and confirm them with the enter key:</p>
+<div class="highlight-sql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">USER</span> <span class="n">owncloud</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="n">password</span><span class="p">;</span>
+<span class="k">ALTER</span> <span class="k">USER</span> <span class="n">owncloud</span> <span class="k">DEFAULT</span> <span class="n">TABLESPACE</span> <span class="n">users</span>
+ <span class="k">TEMPORARY</span> <span class="n">TABLESPACE</span> <span class="n">temp</span>
+ <span class="n">QUOTA</span> <span class="n">unlimited</span> <span class="k">ON</span> <span class="n">users</span><span class="p">;</span>
+<span class="k">GRANT</span> <span class="k">create</span> <span class="k">session</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="k">table</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="k">procedure</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="n">sequence</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="k">trigger</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="k">view</span>
+ <span class="p">,</span> <span class="k">create</span> <span class="n">synonym</span>
+ <span class="p">,</span> <span class="k">alter</span> <span class="k">session</span>
+ <span class="k">TO</span> <span class="n">owncloud</span><span class="p">;</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">In Oracle creating a user is the same as creating a database in other RDBMs, so no <tt class="docutils literal"><span class="pre">CREATE</span> <span class="pre">DATABASE</span></tt> statement is necessary.</p>
+</div>
+<p>You can quit the prompt by entering:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="nb">exit</span>
+</pre></div>
+</div>
+<p>In the ownCloud configuration you need to set the hostname on which the
+database is running and a valid username and password to
+access it. If the database has been installed on the same server as
+ownCloud to config file could look like this:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"dbtype"</span> <span class="o">=></span> <span class="s2">"oci"</span><span class="p">,</span>
+ <span class="s2">"dbname"</span> <span class="o">=></span> <span class="s2">"XE"</span><span class="p">,</span>
+ <span class="s2">"dbuser"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"dbpassword"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+ <span class="s2">"dbhost"</span> <span class="o">=></span> <span class="s2">"localhost"</span><span class="p">,</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This example assumes you are running an Oracle Express Edition on <tt class="docutils literal"><span class="pre">localhost</span></tt>. The <tt class="docutils literal"><span class="pre">dbname</span></tt> is the name</p>
+</div>
+<p>of the Oracle instance. For Oracle Express Edition it is always <tt class="docutils literal"><span class="pre">XE</span></tt>.</p>
+</div>
+</div>
+<div class="section" id="trouble-shooting">
+<h2>Trouble Shooting<a class="headerlink" href="#trouble-shooting" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="how-can-i-find-out-if-my-mysql-postgresql-server-is-reachable">
+<h3>How can I find out if my MySQL/PostgreSQL server is reachable?<a class="headerlink" href="#how-can-i-find-out-if-my-mysql-postgresql-server-is-reachable" title="Permalink to this headline">¶</a></h3>
+<p>Use the ping command to check the server availability:</p>
+<div class="highlight-python"><pre>ping db.server.dom</pre>
+</div>
+<div class="highlight-python"><pre>PING db.server.dom (ip-address) 56(84) bytes of data.
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=1 ttl=64 time=3.64 ms
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=2 ttl=64 time=0.055 ms
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=3 ttl=64 time=0.062 ms</pre>
+</div>
+</div>
+<div class="section" id="how-can-i-find-out-if-a-created-user-can-access-a-database">
+<h3>How can I find out if a created user can access a database?<a class="headerlink" href="#how-can-i-find-out-if-a-created-user-can-access-a-database" title="Permalink to this headline">¶</a></h3>
+<p>The easiest way to test if a database can be accessed is by starting the
+command line interface:</p>
+<p><strong>SQLite</strong>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">sqlite3</span> <span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">htdocs</span><span class="o">/</span><span class="n">owncloud</span><span class="o">/</span><span class="n">data</span><span class="o">/</span><span class="n">owncloud</span><span class="o">.</span><span class="n">db</span>
+</pre></div>
+</div>
+<div class="highlight-python"><pre>sqlite> .version
+SQLite 3.7.15.1 2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318
+sqlite> .quit</pre>
+</div>
+<p><strong>MySQL</strong>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">uUSERNAME</span> <span class="o">-</span><span class="n">p</span>
+</pre></div>
+</div>
+<div class="highlight-python"><pre>mysql> SHOW VARIABLES LIKE "version";
++---------------+--------+
+| Variable_name | Value |
++---------------+--------+
+| version | 5.1.67 |
++---------------+--------+
+1 row in set (0.00 sec)
+mysql> quit</pre>
+</div>
+<p><strong>PostgreSQL</strong>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">psql</span> <span class="o">-</span><span class="n">Uusername</span> <span class="o">-</span><span class="n">downcloud</span>
+</pre></div>
+</div>
+<div class="highlight-python"><pre>postgres=# SELECT version();
+PostgreSQL 8.4.12 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 4.1.3 20080704 (prerelease), 32-bit
+(1 row)
+postgres=# \q</pre>
+</div>
+<p><strong>Oracle</strong>:</p>
+<div class="highlight-python"><pre>sqlplus username</pre>
+</div>
+<div class="highlight-python"><pre>SQL> select * from v$version;
+
+BANNER
+--------------------------------------------------------------------------------
+Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production
+PL/SQL Release 11.2.0.2.0 - Production
+CORE 11.2.0.2.0 Production
+TNS for Linux: Version 11.2.0.2.0 - Production
+NLSRTL Version 11.2.0.2.0 - Production
+
+SQL> exit</pre>
+</div>
+</div>
+<div class="section" id="useful-sql-commands">
+<h3>Useful SQL commands<a class="headerlink" href="#useful-sql-commands" title="Permalink to this headline">¶</a></h3>
+<p><strong>Show Database Users</strong>:</p>
+<div class="highlight-python"><pre>SQLite : No database user is required.
+MySQL : SELECT User,Host FROM mysql.user;
+PostgreSQL: SELECT * FROM pg_user;
+Oracle : SELECT * FROM all_users;</pre>
+</div>
+<p><strong>Show available Databases</strong>:</p>
+<div class="highlight-python"><pre>SQLite : .databases (normally one database per file!)
+MySQL : SHOW DATABASES;
+PostgreSQL: \l
+Oracle : SELECT name FROM v$database; (requires DBA privileges)</pre>
+</div>
+<p><strong>Show ownCloud Tables in Database</strong>:</p>
+<div class="highlight-python"><pre>SQLite : .tables
+MySQL : USE owncloud; SHOW TABLES;
+PostgreSQL: \c owncloud; \d
+Oracle : SELECT table_name FROM user_tables;</pre>
+</div>
+<p><strong>Quit Database</strong>:</p>
+<div class="highlight-python"><pre>SQLite : .quit
+MySQL : quit
+PostgreSQL: \q
+Oracle : quit</pre>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_encryption.html
index 4cc9f9c,0000000..8a7bd00
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_encryption.html
+++ b/core/doc/admin/configuration/configuration_encryption.html
@@@ -1,224 -1,0 +1,224 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Use Server-Side Encryption — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Knowledge Base Configuration" href="configuration_knowledgebase.html" />
+ <link rel="prev" title="Database Configuration" href="configuration_database.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Use Server-Side Encryption</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#enable-file-recovery-feature">Enable File Recovery Feature</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#recover-user-files">Recover User Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#ldap-and-other-external-user-back-ends">LDAP and other external user back-ends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="use-server-side-encryption">
+<h1>Use Server-Side Encryption<a class="headerlink" href="#use-server-side-encryption" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud ships a encryption app, which allows to encrypt all files stored in
+your ownCloud. Encryption and decryption always happens server-side. This
+enables the user to continue to use all the other apps to view and edit his
+data.</p>
+<p>The app uses the user’s log-in password as encryption-password. This means that
+by default the user will lose access to his files if he loses his log-in
+password.</p>
+<p>It might be a good idea to make regular backups of all encryption keys. The
+encryption keys are stored in following folders:</p>
+<ul class="simple">
+<li>data/owncloud_private_key (recovery key, if enabled and public share key)</li>
+<li>data/public-keys (public keys from all users)</li>
+<li>data/<user>/files_encryption (users’ private keys and all other keys necessary to
+decrypt the users’ files)</li>
+</ul>
+<div class="section" id="enable-file-recovery-feature">
+<h2>Enable File Recovery Feature<a class="headerlink" href="#enable-file-recovery-feature" title="Permalink to this headline">¶</a></h2>
+<p>The admin can offer the user some kind of protection against password
+loss. Therefore you have to enable the recovery key in the admin settings and
+provide a strong recovery key password. The admin settings also enables you to
+change the recovery key password if you wish. But you should make sure to never
+lose this password, because that’s the only way to recover users’ files.</p>
+<p>Once the recovery key was enabled every user can choose in his personal
+settings to enable this feature or not.</p>
+</div>
+<div class="section" id="recover-user-files">
+<h2>Recover User Files<a class="headerlink" href="#recover-user-files" title="Permalink to this headline">¶</a></h2>
+<p>If the recovery feature was enabled the admin will see a additional input field
+at the top of the user management settings. After entering the recovery-key
+password the admin can change the user’s log-in password which will
+automatically recover the user’s file.</p>
+<p>If you use a user back-end which doesn’t allow you to change the log-in
+password directly within ownCloud, e.g. the LDAP back-end, than you can follow
+the same procedure to recover a user’s files. The only difference is that
+you need to change the log-in password additionally at your back-end. In this
+case make sure to use both times the same password.</p>
+</div>
+<div class="section" id="ldap-and-other-external-user-back-ends">
+<h2>LDAP and other external user back-ends<a class="headerlink" href="#ldap-and-other-external-user-back-ends" title="Permalink to this headline">¶</a></h2>
+<p>if you configure a external user back-end you will be able to change the user’s log-in password
+at the back-end. Since the encryption password must be the same as the user’s log-in password
+this will result in a non-functional encryption system. If the recovery feature was enabled,
+the administrator will be able to recover the user’s files directly over the recovery feature.
+See the description above. Otherwise the user will be informed that his log-in password and
+his encryption password no longer matches after his next log-in. In this case the user will be
+able to adjust his encryption password in the personal settings by providing both, his old and
+his new log-in password.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_knowledgebase.html
index 0809c02,0000000..983723c
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_knowledgebase.html
+++ b/core/doc/admin/configuration/configuration_knowledgebase.html
@@@ -1,193 -1,0 +1,193 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Knowledge Base Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Language Configuration" href="configuration_language.html" />
+ <link rel="prev" title="Use Server-Side Encryption" href="configuration_encryption.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Knowledge Base Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="knowledge-base-configuration">
+<h1>Knowledge Base Configuration<a class="headerlink" href="#knowledge-base-configuration" title="Permalink to this headline">¶</a></h1>
+<p>The usage of ownCloud is more or less self explaining but nevertheless a user
+might run into a problem where he needs to consult the documentation or knowledge base. To ease access to the ownCloud
+documentation and knowledge base, a help menu item is shown in the settings menu by default.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>If you want to disable the ownCloud help menu item you can use the <strong>knowledgebaseenabled</strong> parameter inside the
+<tt class="file docutils literal"><span class="pre">config/config.php</span></tt>. The <strong>knowledgebaseurl</strong> parameter is used to set the http path to the ownCloud help page.
+The server should support <abbr title="Open Collaboration Services">OCS</abbr>.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"knowledgebaseenabled"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
+ <span class="s2">"knowledgebaseurl"</span> <span class="o">=></span> <span class="s2">"http://api.apps.owncloud.com/v1"</span><span class="p">,</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Disabling the help menu item might increase the number of support request you have to answer in the future</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_language.html
index e452023,0000000..0dd60d6
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_language.html
+++ b/core/doc/admin/configuration/configuration_language.html
@@@ -1,190 -1,0 +1,190 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Language Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Logging Configuration" href="configuration_logging.html" />
+ <link rel="prev" title="Knowledge Base Configuration" href="configuration_knowledgebase.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Language Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="language-configuration">
+<h1>Language Configuration<a class="headerlink" href="#language-configuration" title="Permalink to this headline">¶</a></h1>
+<p>In normal cases ownCloud will automatically detect the language of the Web-GUI.
+If this doesn’t work properly or you want to make sure that ownCloud always
+starts with a given language, you can use the <strong>default_language</strong> parameter.</p>
+<p>Please keep in mind, that this will not effect a users language preference,
+which has been configured under “personal -> language” once he has logged in.</p>
+<p>Please check <tt class="file docutils literal"><span class="pre">settings/languageCodes.php</span></tt> for the list of supported language
+codes.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"default_language"</span> <span class="o">=></span> <span class="s2">"en"</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_logging.html
index b9be4ee,0000000..7ff2992
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_logging.html
+++ b/core/doc/admin/configuration/configuration_logging.html
@@@ -1,226 -1,0 +1,226 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Logging Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Mail Configuration" href="configuration_mail.html" />
+ <link rel="prev" title="Language Configuration" href="configuration_language.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Logging Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="logging-configuration">
+<h1>Logging Configuration<a class="headerlink" href="#logging-configuration" title="Permalink to this headline">¶</a></h1>
+<p>To get an idea of how the current status of an ownCloud system is or to
+solve issues log information is a good point to start with. ownCloud allows
+to configure the way how and which depth of information should be logged.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>First you need to decide in which way logging should be done. You can
+choose between the two options <strong>owncloud</strong> and <strong>syslog</strong>. Then you need
+to configure the log level which directly influences how much information
+will be logged. You can choose between:</p>
+<ul class="simple">
+<li><strong>0</strong>: DEBUG</li>
+<li><strong>1</strong>: INFO</li>
+<li><strong>2</strong>: WARN</li>
+<li><strong>3</strong>: ERROR</li>
+</ul>
+<p>The most detailed information will be written if <strong>0</strong> (DEBUG) is set, the
+least information will be written if <strong>3</strong> (ERROR) is set. Keep in mind that
+it might slow down the whole system if a too detailed logging will has been
+configured. By default the log level is set to <strong>2</strong> (WARN).</p>
+<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
+<div class="section" id="owncloud">
+<h3>ownCloud<a class="headerlink" href="#owncloud" title="Permalink to this headline">¶</a></h3>
+<p>All log information will be written to a separate log file which can be
+viewed using the log menu in the admin menu of ownCloud. By default a log
+file named <strong>owncloud.log</strong> will be created in the directory which has
+been configured by the <strong>datadirectory</strong> parameter.</p>
+<p>The desired date format can optionally be defined using the <strong>logdateformat</strong>.
+By default the <a class="reference external" href="http://www.php.net/manual/en/function.date.php">PHP date function</a> parameter “<em>c</em>” is used and therefore the
+date/time is written in the format “<em>2013-01-10T15:20:25+02:00</em>”. By using the
+date format in the example the date/time format will be written in the format
+“<em>January 10, 2013 15:20:25</em>”.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"log_type"</span> <span class="o">=></span> <span class="s2">"owncloud"</span><span class="p">,</span>
+ <span class="s2">"logfile"</span> <span class="o">=></span> <span class="s2">"owncloud.log"</span><span class="p">,</span>
+ <span class="s2">"loglevel"</span> <span class="o">=></span> <span class="s2">"3"</span><span class="p">,</span>
+ <span class="s2">"logdateformat"</span> <span class="o">=></span> <span class="s2">"F d, Y H:i:s"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="syslog">
+<h3>syslog<a class="headerlink" href="#syslog" title="Permalink to this headline">¶</a></h3>
+<p>All log information will be send to the default syslog daemon of a system.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"log_type"</span> <span class="o">=></span> <span class="s2">"syslog"</span><span class="p">,</span>
+ <span class="s2">"logfile"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"loglevel"</span> <span class="o">=></span> <span class="s2">"3"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_mail.html
index 63baa4d,0000000..3bdc12a
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_mail.html
+++ b/core/doc/admin/configuration/configuration_mail.html
@@@ -1,456 -1,0 +1,456 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Mail Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Maintenance Mode Configuration" href="configuration_maintenance.html" />
+ <link rel="prev" title="Logging Configuration" href="configuration_logging.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Mail Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#trouble-shooting">Trouble shooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="mail-configuration">
+<h1>Mail Configuration<a class="headerlink" href="#mail-configuration" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud does not contain a full email program but contains some parameters to
+allow to send e.g. password reset email to the users. This function relies on
+the <a class="reference external" href="http://sourceforge.net/projects/phpmailer/">PHPMailer library</a>. To
+take advantage of this function it needs to be configured properly.</p>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<p>Different requirements need to be matched, depending on the environment which
+you are using and the way how you want to send email. You can choose between
+<strong>SMTP</strong>, <strong>PHP mail</strong>, <strong>Sendmail</strong> and <strong>qmail</strong>.</p>
+</div>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>All parameters need to be set in <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
+<div class="section" id="smtp">
+<h3>SMTP<a class="headerlink" href="#smtp" title="Permalink to this headline">¶</a></h3>
+<p>If you want to send email using a local or remote SMTP server it is necessary
+to enter the name or ip address of the server, optionally followed by a colon
+separated port number, e.g. <strong>:425</strong>. If this value is not given the default
+port 25/tcp will be used unless you will change that by modifying the
+<strong>mail_smtpport</strong> parameter. Multiple server can be entered separated by
+semicolon:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpmode"</span> <span class="o">=></span> <span class="s2">"smtp"</span><span class="p">,</span>
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"smtp-1.server.dom;smtp-2.server.dom:425"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpport"</span> <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>or</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpmode"</span> <span class="o">=></span> <span class="s2">"smtp"</span><span class="p">,</span>
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"smtp.server.dom"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpport"</span> <span class="o">=></span> <span class="mi">425</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If a malware or SPAM scanner is running on the SMTP server it might be
+necessary that you increase the SMTP timeout to e.g. 30s:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtptimeout"</span> <span class="o">=></span> <span class="mi">30</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If the SMTP server accepts insecure connections, the default setting can be
+used:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s1">''</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If the SMTP server only accepts secure connections you can choose between
+the following two variants:</p>
+<div class="section" id="ssl">
+<h4>SSL<a class="headerlink" href="#ssl" title="Permalink to this headline">¶</a></h4>
+<p>A secure connection will be initiated using the outdated SMTPS protocol
+which uses the port 465/tcp:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"smtp.server.dom:465"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s1">'ssl'</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="tls">
+<h4>TLS<a class="headerlink" href="#tls" title="Permalink to this headline">¶</a></h4>
+<p>A secure connection will be initiated using the STARTTLS protocol which
+uses the default port 25/tcp:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"smtp.server.dom"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s1">'tls'</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>And finally it is necessary to configure if the SMTP server requires
+authentication, if not, the default values can be taken as it.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpauth"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+ <span class="s2">"mail_smtpname"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If SMTP authentication is required you have to set the required username
+and password and can optionally choose between the authentication types
+<strong>LOGIN</strong> (default) or <strong>PLAIN</strong>.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpauth"</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpname"</span> <span class="o">=></span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">"password"</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="php-mail">
+<h3>PHP mail<a class="headerlink" href="#php-mail" title="Permalink to this headline">¶</a></h3>
+<p>If you want to use PHP mail it is necessary to have an installed and working
+email system on your server. Which program in detail is used to send email is
+defined by the configuration settings in the <strong>php.ini</strong> file. (On *nix
+systems this will most likely be Sendmail.) ownCloud should be able to send
+email out of the box.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpmode"</span> <span class="o">=></span> <span class="s2">"php"</span><span class="p">,</span>
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpport"</span> <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
+ <span class="s2">"mail_smtptimeout"</span> <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
+ <span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauth"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpname"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="sendmail">
+<h3>Sendmail<a class="headerlink" href="#sendmail" title="Permalink to this headline">¶</a></h3>
+<p>If you want to use the well known Sendmail program to send email, it is
+necessary to have an installed and working email system on your *nix server.
+The sendmail binary (<strong>/usr/sbin/sendmail</strong>) is usually part of that system.
+ownCloud should be able to send email out of the box.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpmode"</span> <span class="o">=></span> <span class="s2">"sendmail"</span><span class="p">,</span>
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpport"</span> <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
+ <span class="s2">"mail_smtptimeout"</span> <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
+ <span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauth"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpname"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="qmail">
+<h3>qmail<a class="headerlink" href="#qmail" title="Permalink to this headline">¶</a></h3>
+<p>If you want to use the qmail program to send email, it is necessary to have an
+installed and working qmail email system on your server. The sendmail binary
+(<strong>/var/qmail/bin/sendmail</strong>) will then be used to send email. ownCloud should
+be able to send email out of the box.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpmode"</span> <span class="o">=></span> <span class="s2">"qmail"</span><span class="p">,</span>
+ <span class="s2">"mail_smtphost"</span> <span class="o">=></span> <span class="s2">"127.0.0.1"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpport"</span> <span class="o">=></span> <span class="mi">25</span><span class="p">,</span>
+ <span class="s2">"mail_smtptimeout"</span> <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
+ <span class="s2">"mail_smtpsecure"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauth"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+ <span class="s2">"mail_smtpauthtype"</span> <span class="o">=></span> <span class="s2">"LOGIN"</span><span class="p">,</span>
+ <span class="s2">"mail_smtpname"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"mail_smtppassword"</span> <span class="o">=></span> <span class="s2">""</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="send-a-test-email">
+<h2>Send a Test Email<a class="headerlink" href="#send-a-test-email" title="Permalink to this headline">¶</a></h2>
+<p>The only way to test your email configuration is, to force a login failure,
+because a function to send a test email has not be implemented yet.</p>
+<p>First make sure that you are using a full qualified domain and not an ip address in the ownCloud URL, like:</p>
+<div class="highlight-python"><pre>http://my-owncloud-server.domain.dom/owncloud/</pre>
+</div>
+<p>The password reset function fetches the domain name from that URL to build the
+email sender address, e.g.:</p>
+<div class="highlight-python"><pre>john at domain.dom</pre>
+</div>
+<p>Next you need to enter your login and an <em>invalid</em> password. As soon as you
+press the login button the login mask reappears and a <strong>I’ve forgotten my password</strong> link will be shown above the login
+field. Click on that link, re-enter your login and press the <strong>Reset password</strong> button - that’s all.</p>
+</div>
+<div class="section" id="trouble-shooting">
+<h2>Trouble shooting<a class="headerlink" href="#trouble-shooting" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="my-web-domain-is-different-from-my-mail-domain">
+<h3>My web domain is different from my mail domain?<a class="headerlink" href="#my-web-domain-is-different-from-my-mail-domain" title="Permalink to this headline">¶</a></h3>
+<p>The default domain name used for the sender address is the hostname where your ownCloud installation is served.
+If you have a different mail domain name you can override this behavior by setting the following configuration parameter:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_domain"</span> <span class="o">=></span> <span class="s2">"example.com"</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>Now every mail send by ownCloud e.g. password reset email, will have the domain part of the sender address look like:</p>
+<div class="highlight-python"><pre>no-reply at example.com</pre>
+</div>
+</div>
+<div class="section" id="how-can-i-find-out-if-a-smtp-server-is-reachable">
+<h3>How can I find out if a SMTP server is reachable?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-is-reachable" title="Permalink to this headline">¶</a></h3>
+<p>Use the ping command to check the server availability:</p>
+<div class="highlight-python"><pre>ping smtp.server.dom</pre>
+</div>
+<div class="highlight-python"><pre>PING smtp.server.dom (ip-address) 56(84) bytes of data.
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=1 ttl=64 time=3.64 ms
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=2 ttl=64 time=0.055 ms
+64 bytes from your-server.local.lan (192.168.1.10): icmp_req=3 ttl=64 time=0.062 ms</pre>
+</div>
+</div>
+<div class="section" id="how-can-i-find-out-if-the-smtp-server-is-listening-on-a-specific-tcp-port">
+<h3>How can I find out if the SMTP server is listening on a specific tcp port?<a class="headerlink" href="#how-can-i-find-out-if-the-smtp-server-is-listening-on-a-specific-tcp-port" title="Permalink to this headline">¶</a></h3>
+<p>A SMTP server is usually listening on port <strong>25/tcp</strong> (smtp) and/or in
+rare circumstances is also listening on the outdated port <strong>465/tcp</strong> (smtps).
+You can use the telnet command to check if a port is available:</p>
+<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
+</div>
+<div class="highlight-python"><pre>Trying 192.168.1.10...
+Connected to smtp.domain.dom.
+Escape character is '^]'.
+220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:28:14 +0100</pre>
+</div>
+</div>
+<div class="section" id="how-can-i-find-out-if-a-smtp-server-supports-the-outdated-smtps-protocol">
+<h3>How can I find out if a SMTP server supports the outdated SMTPS protocol?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-supports-the-outdated-smtps-protocol" title="Permalink to this headline">¶</a></h3>
+<p>A good indication that a SMTP server supports the SMTPS protocol is that it
+is listening on port <strong>465/tcp</strong>. How this can be checked has been described
+previously.</p>
+</div>
+<div class="section" id="how-can-i-find-out-if-a-smtp-server-supports-the-tls-protocol">
+<h3>How can I find out if a SMTP server supports the TLS protocol?<a class="headerlink" href="#how-can-i-find-out-if-a-smtp-server-supports-the-tls-protocol" title="Permalink to this headline">¶</a></h3>
+<p>A SMTP server usually announces the availability of STARTTLS right after a
+connection has been established. This can easily been checked with the telnet command. You need to enter the marked lines to get the information displayed:</p>
+<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
+</div>
+<div class="highlight-python"><pre>Trying 192.168.1.10...
+Connected to smtp.domain.dom.
+Escape character is '^]'.
+220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:39:55 +0100
+EHLO your-server.local.lan # <<< enter this command
+250-smtp.domain.dom Hello your-server.local.lan [ip-address]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250-AUTH PLAIN LOGIN CRAM-MD5
+250-STARTTLS # <<< STARTTLS is supported!
+250 HELP
+QUIT # <<< enter this command
+221 smtp.domain.dom closing connection
+Connection closed by foreign host.</pre>
+</div>
+</div>
+<div class="section" id="how-can-i-find-out-which-authentication-types-methods-a-smtp-server-supports">
+<h3>How can I find out which authentication types/methods a SMTP server supports?<a class="headerlink" href="#how-can-i-find-out-which-authentication-types-methods-a-smtp-server-supports" title="Permalink to this headline">¶</a></h3>
+<p>A SMTP server usually announces the available authentication types/methods
+right after a connection has been established. This can easily been checked
+with the telnet command. You need to enter the marked lines to get the
+information displayed:</p>
+<div class="highlight-python"><pre>telnet smtp.domain.dom 25</pre>
+</div>
+<div class="highlight-python"><pre>Trying 192.168.1.10...
+Connected to smtp.domain.dom.
+Escape character is '^]'.
+220 smtp.domain.dom ESMTP Exim 4.80.1 Tue, 22 Jan 2013 22:39:55 +0100
+EHLO your-server.local.lan # <<< enter this command
+250-smtp.domain.dom Hello your-server.local.lan [ip-address]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250-AUTH PLAIN LOGIN CRAM-MD5 # <<< available Authentication types
+250-STARTTLS
+250 HELP
+QUIT # <<< enter this command
+221 smtp.domain.dom closing connection
+Connection closed by foreign host.</pre>
+</div>
+</div>
+<div class="section" id="enable-debug-mode">
+<h3>Enable Debug Mode<a class="headerlink" href="#enable-debug-mode" title="Permalink to this headline">¶</a></h3>
+<p>If you are still not able to send email it might be useful to activate
+further debug messages by setting the following parameter. Right after
+you have pressed the <strong>Reset password</strong> button, as described before, a
+lot of <strong>SMTP -> get_lines(): ...</strong> messages will be written on the
+screen.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"mail_smtpdebug"</span> <span class="o">=></span> <span class="k">true</span><span class="p">;</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_maintenance.html
index f91d416,0000000..df98200
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_maintenance.html
+++ b/core/doc/admin/configuration/configuration_maintenance.html
@@@ -1,187 -1,0 +1,187 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Maintenance Mode Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Preview Configuration" href="configuration_preview.html" />
+ <link rel="prev" title="Mail Configuration" href="configuration_mail.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Maintenance Mode Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="maintenance-mode-configuration">
+<h1>Maintenance Mode Configuration<a class="headerlink" href="#maintenance-mode-configuration" title="Permalink to this headline">¶</a></h1>
+<p>If you want to prevent users to login to ownCloud before you start doing
+some maintenance work, you need to set the value of the <strong>maintenance</strong>
+parameter to <em>true</em>. Please keep in mind that users who are already logged-in
+are kicked out of ownCloud instantly.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+ <span class="s2">"maintenance"</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>This parameters can be set in the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_preview.html
index 236ef86,0000000..47a9fd1
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_preview.html
+++ b/core/doc/admin/configuration/configuration_preview.html
@@@ -1,283 -1,0 +1,283 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Preview Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Reverse Proxy Configuration" href="configuration_reverseproxy.html" />
+ <link rel="prev" title="Maintenance Mode Configuration" href="configuration_maintenance.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Preview Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#soft-dependencies">Soft dependencies:</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="preview-configuration">
+<h1>Preview Configuration<a class="headerlink" href="#preview-configuration" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud 6 introduced the new thumbnail system. It is used to generate
+thumbnails from various file types.
+By default, it can generate previews for:</p>
+<ul class="simple">
+<li>Images</li>
+<li>Movies</li>
+<li>Cover from mp3 files</li>
+<li>various office files</li>
+<li>Pdf</li>
+<li>Svg</li>
+<li>Text</li>
+</ul>
+<div class="section" id="soft-dependencies">
+<h2>Soft dependencies:<a class="headerlink" href="#soft-dependencies" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="imagick">
+<h3>imagick:<a class="headerlink" href="#imagick" title="Permalink to this headline">¶</a></h3>
+<p>ownCloud needs the imagick php extension to generate previews from office, pdf
+and svg files. For further information on how to install the imagick php
+extension on your system take a look at the <a class="reference external" href="http://www.php.net/manual/en/imagick.installation.php">PHP documentation</a>.
+If imagick is not installed, ownCloud will show file type icons instead of previews.</p>
+</div>
+<div class="section" id="libreoffice-openoffice">
+<h3>LibreOffice / OpenOffice:<a class="headerlink" href="#libreoffice-openoffice" title="Permalink to this headline">¶</a></h3>
+<p>ownCloud comes with a php-only preview system for office files. But this
+preview system has limited capabilities and is only able to create previews
+from basic Microsoft Office files. If you need previews from advanced
+Microsoft Office files or OpenDocument files, you have to install LibreOffice
+or OpenOffice. To learn more about installing LibreOffice/OpenOffice consider
+your distribution’s documentation.</p>
+</div>
+<div class="section" id="avconv-ffmpeg">
+<h3>avconv / ffmpeg:<a class="headerlink" href="#avconv-ffmpeg" title="Permalink to this headline">¶</a></h3>
+<p>ownCloud requires avconv of ffmpeg to generate previews from movies. To learn
+more about installing avconv or ffmpeg consider your distribution’s
+documentation.</p>
+</div>
+</div>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="disabling-previews">
+<h3>Disabling previews:<a class="headerlink" href="#disabling-previews" title="Permalink to this headline">¶</a></h3>
+<p>Under certain circumstances like a big user base or limited resources you might
+want to consider disabling previews.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'enable_previews'</span> <span class="o">=></span> <span class="k">true</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>There is a config option called ‘enable_previews’. By default it’s set to true.
+You can disable previews by setting this option to false:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'enable_previews'</span> <span class="o">=></span> <span class="k">false</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="maximum-preview-size">
+<h3>Maximum preview size:<a class="headerlink" href="#maximum-preview-size" title="Permalink to this headline">¶</a></h3>
+<p>There are two config options to set the maximum size of a preview.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_max_x'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
+ <span class="s1">'preview_max_y'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>By default, both config options are set to null. ‘Null’ is equal to no limit.
+Numeric values represent the size in pixel. The following code limits previews
+to a maximum size of 100px by 100px:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_max_x'</span> <span class="o">=></span> <span class="mi">100</span><span class="p">,</span>
+ <span class="s1">'preview_max_y'</span> <span class="o">=></span> <span class="mi">100</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>‘preview_max_x’ represents the x-axis and ‘preview_max_y’ represents the y-axis.</p>
+</div>
+<div class="section" id="maximum-scale-factor">
+<h3>Maximum scale factor:<a class="headerlink" href="#maximum-scale-factor" title="Permalink to this headline">¶</a></h3>
+<p>If you have a lot of small pictures and the preview system generates blurry
+previews, you might want to consider setting a maximum scale factor. By default,
+ownCloud scales pictures up to 10 times the original size:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="mi">10</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If you want to disable scaling at all, you can set the config value to ‘1’:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="mi">1</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>If you want to disable the maximum scaling factor, you can set the config value to ‘null’:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_max_scale_factor'</span> <span class="o">=></span> <span class="k">null</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id1">
+<h3>LibreOffice / OpenOffice:<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>You can set a custom path for the LibreOffice binary. If LibreOffice is not yet
+available on your system, you can also use OpenOffice instead.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_libreoffice_path'</span> <span class="o">=></span> <span class="s1">'/usr/bin/libreoffice'</span><span class="p">,</span>
+</pre></div>
+</div>
+<p>You can set custom LibreOffice / OpenOffice command line parameters by setting
+the preview_office_cl_parameters option.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+ <span class="s1">'preview_office_cl_parameters'</span> <span class="o">=></span> <span class="s1">' '</span><span class="p">,</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_reverseproxy.html
index 92dd624,0000000..c519abe
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_reverseproxy.html
+++ b/core/doc/admin/configuration/configuration_reverseproxy.html
@@@ -1,219 -1,0 +1,219 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Reverse Proxy Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Uploading big files > 512MB (as set by default)" href="configuring_big_file_upload.html" />
+ <link rel="prev" title="Preview Configuration" href="configuration_preview.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="reverse-proxy-configuration">
+<h1>Reverse Proxy Configuration<a class="headerlink" href="#reverse-proxy-configuration" title="Permalink to this headline">¶</a></h1>
+<p>The automatic hostname, protocol or webroot detection of ownCloud can fail in
+certain reverse proxy situations. This configuration allows to manually override
+the automatic detection.</p>
+<div class="section" id="parameters">
+<h2>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h2>
+<p>If ownCloud fails to automatically detected the hostname, protocol or webroot
+you can use the <strong>overwrite</strong> parameters inside the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt>.
+The <strong>overwritehost</strong> parameter is used to set the hostname of the proxy. You
+can also specify a port. The <strong>overwriteprotocol</strong> parameter is used to set the
+protocol of the proxy. You can choose between the two options <strong>http</strong> and
+<strong>https</strong>. The <strong>overwritewebroot</strong> parameter is used to set the absolute web
+path of the proxy to the ownCloud folder. When you want to keep the automatic
+detection of one of the three parameters you can leave the value empty or don’t
+set it. The <strong>overwritecondaddr</strong> parameter is used to overwrite the values
+dependent on the remote address. The value must be a <strong>regular expression</strong> of
+the IP addresses of the proxy. This is useful when you use a reverse SSL proxy
+only for https access and you want to use the automatic detection for http
+access.</p>
+</div>
+<div class="section" id="example">
+<h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="multiple-domains-reverse-ssl-proxy">
+<h3>Multiple Domains Reverse SSL Proxy<a class="headerlink" href="#multiple-domains-reverse-ssl-proxy" title="Permalink to this headline">¶</a></h3>
+<p>If you want to access your ownCloud installation <strong>http://domain.tld/owncloud</strong>
+via a multiple domains reverse SSL proxy
+<strong>https://ssl-proxy.tld/domain.tld/owncloud</strong> with the IP address <strong>10.0.0.1</strong>
+you can set the following parameters inside the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt>.</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+<span class="nv">$CONFIG</span> <span class="o">=</span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"overwritehost"</span> <span class="o">=></span> <span class="s2">"ssl-proxy.tld"</span><span class="p">,</span>
+ <span class="s2">"overwriteprotocol"</span> <span class="o">=></span> <span class="s2">"https"</span><span class="p">,</span>
+ <span class="s2">"overwritewebroot"</span> <span class="o">=></span> <span class="s2">"/domain.tld/owncloud"</span><span class="p">,</span>
+ <span class="s2">"overwritecondaddr"</span> <span class="o">=></span> <span class="s2">"^10\.0\.0\.1$"</span><span class="p">,</span>
+<span class="p">);</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you want to use the SSL proxy during installation you have to
+create the <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> otherwise you have to extend to existing
+<strong>$CONFIG</strong> array.</p>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuration_users.html
index ab9f53c,0000000..e4e6653
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuration_users.html
+++ b/core/doc/admin/configuration/configuration_users.html
@@@ -1,378 -1,0 +1,378 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>User Management — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="User Authentication with LDAP" href="auth_ldap.html" />
+ <link rel="prev" title="Apps Configuration" href="configuration_apps.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#users">Users</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#user-groups">User Groups</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="user-management">
+<h1>User Management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud administrators can easily manage users via the web interface. To go into
+user management page, click your username on the web interface and select <em>Users</em>.
+A page similar to the image below will be shown:</p>
+<div class="figure">
+<img alt="../_images/oc_admin_user_manage.png" src="../_images/oc_admin_user_manage.png" />
+</div>
+<p>Users management page</p>
+<p>A fictive use case will help you understand the concept of users, user groups
+and group admins.</p>
+<p>Think of a small, 25-member staff company, named “Cloud Lovers”, that is lead
+by its founder Richard. In this company Bob acts as IT operator and recently
+set up ownCloud. Being the installing user, Bob is member of the so called
+“admin” user group of ownCloud. His colleague Tom, who provides support if Bob
+is on holiday, is member of the “admin” user group as well. All employees,
+including Bob and Tom, are members of the user group “Internal”, that is used
+to share data across the company. Mostly for operational data, that should not
+be accessible to all employees, Bob created the “Administration” user group
+having two members: Richard and his assistant Susan. Richard is group admin of
+this user group, so he can manage the members of the “Administration” user
+group on his own.</p>
+<div class="section" id="users">
+<h2>Users<a class="headerlink" href="#users" title="Permalink to this headline">¶</a></h2>
+<p>A user represents an account of the ownCloud installation. In this section the
+core properties are listed.</p>
+<dl class="docutils">
+<dt><em>Login name (Username)</em></dt>
+<dd>This is the unique ID of a ownCloud user (e.g. test, jon.doe).</dd>
+<dt><em>Full Name</em></dt>
+<dd>This is the name that is used all over the user interface to identify the
+user i.e. when sharing data or sending mails. If no display name is set, it
+defaults to the login name.</dd>
+<dt><em>Password</em></dt>
+<dd>This is the password the user uses to login to ownCloud.</dd>
+<dt><em>Groups</em></dt>
+<dd>This is a list of security groups the user is assigned to. By default the
+user is not member of any user group.</dd>
+<dt><em>Group Admin</em></dt>
+<dd>This is a list of security groups the user has administration privileges for.
+By default the user is not registered as group admin for any user group.</dd>
+<dt><em>Storage</em></dt>
+<dd>This is the maximum disk space that may be used by the user. If the user
+reaches this limit he/she is not able to upload or sync further data. The
+storage quota is specified in the format <em>Number Unit</em> (e.g. 100 B (byte),
+50 KB (kilobyte), 20 MB (megabyte), 5 GB (gigabyte)). If no unit is given,
+the number is interpreted as bytes.</dd>
+</dl>
+<p>Each user is able to change its display name and password.</p>
+<div class="section" id="create-a-user">
+<h3>Create a user<a class="headerlink" href="#create-a-user" title="Permalink to this headline">¶</a></h3>
+<p>Before users can sign in and share data, they need ownCloud user accounts.</p>
+<p>To create a user account:</p>
+<ol class="arabic">
+<li><p class="first">Enter the new user’s <strong>Login Name</strong> and its initial <strong>Password</strong> in the
+appropriate fields.</p>
+</li>
+<li><p class="first">(Optional) Select the <strong>Groups</strong> to which you want to assign the new user.</p>
+</li>
+<li><p class="first">Click <strong>Create</strong>.</p>
+</li>
+<li><p class="first">(Optional) Edit additional user settings.</p>
+<p>To set other user settings, such as setting a display name or limiting the
+user’s storage, see instructions as follows.</p>
+</li>
+</ol>
+<p>Created users will have the storage specified on <em>Default Storage</em> setting
+on the same page.</p>
+<p>Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
+underscores (_), periods (.) and at signs (@).</p>
+</div>
+<div class="section" id="reset-a-user-s-password">
+<h3>Reset a user’s password<a class="headerlink" href="#reset-a-user-s-password" title="Permalink to this headline">¶</a></h3>
+<p>To reset a user’s password:</p>
+<ol class="arabic simple">
+<li>Hover the line of the user.</li>
+<li>Click on the <strong>pencil icon</strong> next to the password field.</li>
+<li>Enter the user’s new password in the password field and then hit the
+<strong>Enter</strong> key of your keyboard.</li>
+</ol>
+<p>Remember to provide the user with the new login information after you have
+reset the password.</p>
+</div>
+<div class="section" id="rename-a-user">
+<h3>Rename a user<a class="headerlink" href="#rename-a-user" title="Permalink to this headline">¶</a></h3>
+<p>Each ownCloud user has two names: an unique <em>login name</em> used for
+authentication, and a <em>display name</em> (e.g. the user’s first name and last name)
+used in the user interface. You can edit the display name of a user, but you
+cannot change the login name of any user.</p>
+<p>To set a user’s display name:</p>
+<ol class="arabic simple">
+<li>Hover the line of the user.</li>
+<li>Click on the <strong>pencil icon</strong> next to the display name field.</li>
+<li>Enter the user’s new display name in the corresponding field and then hit
+the <strong>Enter</strong> key of your keyboard.</li>
+</ol>
+</div>
+<div class="section" id="grant-administrator-privileges-to-a-user">
+<h3>Grant administrator privileges to a user<a class="headerlink" href="#grant-administrator-privileges-to-a-user" title="Permalink to this headline">¶</a></h3>
+<p>If a user has administrator privileges, the user has the right to manage other
+users. Within ownCloud there are two types of administrators: <em>Super
+Administrators</em> and <em>Group Administrators</em>.</p>
+<p>Group administrators have the management rights to:</p>
+<ul class="simple">
+<li>Create new users and assign them to the group of the group administrator</li>
+<li>Edit and delete users that are assigned to the group of the group
+administrator</li>
+</ul>
+<p>Group administrators cannot access system settings or modify installation-wide
+configuration like the default storage.</p>
+<p>To assign the <em>super administrator</em> role to a user:</p>
+<ol class="arabic simple">
+<li>Use the drop-down list in <em>Groups</em> column of the user</li>
+<li>Assign the user to the “admin” user group</li>
+</ol>
+<p>To assign the <em>group administrator</em> role to a user:</p>
+<p>Find the user and select the user groups from the <strong>Group Admin</strong> drop-down
+list you want the user become group administrator for.</p>
+</div>
+<div class="section" id="assign-a-user-to-a-user-group">
+<h3>Assign a user to a user group<a class="headerlink" href="#assign-a-user-to-a-user-group" title="Permalink to this headline">¶</a></h3>
+<p>To assign a user to a user group:</p>
+<p>Find the user and select the user groups from the <strong>Groups</strong> drop-down list
+you want to assign the user to. You can use <em>add group</em> link to create a new
+group to assign the user to. You can assign the user more than one group by checking
+multiple groups.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If a file/folder is shared with a group, newly created users will immediately
+have access to the share.</p>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you assign a user to the <em>admin</em> user group, the user will become a
+<em>Super Administrator</em> with unlimited privileges.</p>
+</div>
+</div>
+<div class="section" id="limit-a-user-s-storage">
+<h3>Limit a user’s storage<a class="headerlink" href="#limit-a-user-s-storage" title="Permalink to this headline">¶</a></h3>
+<p>To limit a user’s storage quota:</p>
+<p>Find the user and select an item from the <strong>Storage</strong> drop-down list.</p>
+<blockquote>
+<div><ul class="simple">
+<li>If you select <em>Default</em>, the default storage limit, specified in the
+action bar at the top, is applied.</li>
+<li>If you select <em>Unlimited</em>, the user is not limited until the total disk
+space is consumed.</li>
+<li>If you want to enter a custom limit, select <em>Other...</em>, enter the storage
+quota of your choice and hit the <strong>Enter</strong> key of your keyboard.</li>
+</ul>
+</div></blockquote>
+<p>If you edit the value of the <strong>Default Storage</strong> field in the action bar, all
+users with storage <em>Default</em> are affected by this change, i.e. changing the
+default storage from <em>Unlimited</em> to <em>1 GB</em> will cause all users with <em>Default</em>
+storage being limited to 1 GB storage each.</p>
+</div>
+<div class="section" id="delete-user">
+<h3>Delete User<a class="headerlink" href="#delete-user" title="Permalink to this headline">¶</a></h3>
+<p><strong>Important considerations before deleting a user:</strong></p>
+<ul class="simple">
+<li>The user will no longer be able to sign in to your ownCloud installation.</li>
+<li>You cannot revert the deletion or restore a deleted account.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If this user had a share with a group or user, the share also will
+be deleted permanently.</p>
+</div>
+<p>To delete a user account:</p>
+<ol class="arabic simple">
+<li>Hover the line of the user you want to delete.</li>
+<li>Click the <strong>cross icon</strong> at the end of the line.</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you accidentally delete a user, you can use undo button shown on
+notification bar at the top of the page.</p>
+</div>
+</div>
+</div>
+<div class="section" id="user-groups">
+<h2>User Groups<a class="headerlink" href="#user-groups" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="create-group">
+<h3>Create Group<a class="headerlink" href="#create-group" title="Permalink to this headline">¶</a></h3>
+<p>To create a user group:</p>
+<ol class="arabic simple">
+<li>Open the <strong>Groups</strong> drop-down list in the action bar.</li>
+<li>Click <strong>add group</strong>.</li>
+<li>Enter the name of the new group and then hit the <strong>Enter</strong> key of your
+keyboard.</li>
+</ol>
+<p>You can <em>assign users</em> to the newly created user groups anytime by using users’
+group drop-down list.</p>
+</div>
+<div class="section" id="edit-delete-group">
+<h3>Edit/Delete Group<a class="headerlink" href="#edit-delete-group" title="Permalink to this headline">¶</a></h3>
+<p>Currently, groups cannot be edited (e.g. renamed) or removed. This feature
+will be available in a future version of ownCloud.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you have direct access to the database, you can manually delete the group
+from database tables oc_groups and oc_group_user.</p>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/configuring_big_file_upload.html
index 40f4faa,0000000..517a219
mode 100644,000000..100644
--- a/core/doc/admin/configuration/configuring_big_file_upload.html
+++ b/core/doc/admin/configuration/configuring_big_file_upload.html
@@@ -1,220 -1,0 +1,220 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Uploading big files > 512MB (as set by default) — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Custom Mount Configuration Web-GUI" href="custom_mount_config_gui.html" />
+ <link rel="prev" title="Reverse Proxy Configuration" href="configuration_reverseproxy.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Uploading big files > 512MB (as set by default)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#not-outnumberable-upload-limits">Not outnumberable upload limits:</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#other-recommendable-preconditions">Other recommendable preconditions:</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="uploading-big-files-512mb-as-set-by-default">
+<h1>Uploading big files > 512MB (as set by default)<a class="headerlink" href="#uploading-big-files-512mb-as-set-by-default" title="Permalink to this headline">¶</a></h1>
+<p>It’s usefull to know limiting factors, that make it impossible to exceed the values given by the ownCloud-system:</p>
+<div class="section" id="not-outnumberable-upload-limits">
+<h2>Not outnumberable upload limits:<a class="headerlink" href="#not-outnumberable-upload-limits" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>< 2GB on 32Bit OS-architecture</li>
+<li>< 2GB with Server Version 4.5 or older</li>
+<li>< 2GB with IE6 - IE8</li>
+<li>< 4GB with IE9 - IE10</li>
+</ul>
+</div>
+<div class="section" id="other-recommendable-preconditions">
+<h2>Other recommendable preconditions:<a class="headerlink" href="#other-recommendable-preconditions" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Make sure, that the latest version of php (at least 5.4.9) is installed</li>
+<li>Disable user quota. This means: set the user quota of the account, you are currently logged in, to “unlimited”.</li>
+</ul>
+<p>This is important, because you possibly could not watch otherwise, whether the desired changes take effect.</p>
+</div>
+</div>
+<div class="section" id="enabling-uploading-big-files">
+<h1>Enabling uploading big files<a class="headerlink" href="#enabling-uploading-big-files" title="Permalink to this headline">¶</a></h1>
+<p>Note: The order of the following steps is important! If you swap steps described below, the settings may fail.</p>
+<p><strong>Go to the admin section in the ownCloud-WebUI and do the following:</strong></p>
+<ul class="simple">
+<li>Under “File handling” set the Maximum upload size to the desired value (e.g. 16GB)</li>
+<li>Click the “save”-Button</li>
+</ul>
+<p><strong>Open the php.ini - file</strong></p>
+<ul class="simple">
+<li>Under Debian or SUSE and their derivatives this file lies at /etc/php5/apache2/php.ini</li>
+<li>On Windows, you can find this file within C:/Program Files (x86)/PHP/PHP.ini</li>
+</ul>
+<p><strong>Do the following:</strong></p>
+<ul class="simple">
+<li>Set the following three parameters inside th php.ini to the same value as chosen inside the admin-section one step before:</li>
+<li>upload_max_filesize = 16G (e.g., to stay consistent with the example value above)</li>
+<li>post_max_size = 16G (e.g., to stay consistent with the example value above)</li>
+<li>output_buffering = 16384 (e.g., to stay consistent with the example value above)</li>
+</ul>
+<p>whereas the “output_buffering” has to be given in MegaBytes but as a plain figure (without size-units as ‘M’ or ‘G’)</p>
+<p>These client configurations have been proven by testing maximum file sizes of 16 GB:</p>
+<ul class="simple">
+<li>Linux 32 Bit: Ubuntu, Firefox => 16GB</li>
+<li>Windows 8 64 Bit: Google Chrome => 8GB</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/custom_mount_config.html
index 1b31310,0000000..b91898c
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_mount_config.html
+++ b/core/doc/admin/configuration/custom_mount_config.html
@@@ -1,495 -1,0 +1,495 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Custom Mount Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Custom User Backend Configuration" href="custom_user_backend.html" />
+ <link rel="prev" title="Custom Mount Configuration Web-GUI" href="custom_mount_config_gui.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Custom Mount Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#backends">Backends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="custom-mount-configuration">
+<h1>Custom Mount Configuration<a class="headerlink" href="#custom-mount-configuration" title="Permalink to this headline">¶</a></h1>
+<p>Since ownCloud 4.0 it is possible to configure the filesystem to mount external
+storage providers into ownCloud’s virtual file system. You can configure these
+file systems by creating and editing <tt class="file docutils literal"><span class="pre">data/mount.json</span></tt>. This file contains
+all settings in JSON (JavaScript Object Notation) format. At the moment two
+different types of entries exist:</p>
+<ul class="simple">
+<li><strong>Group mounts:</strong> each entry configures a mount for each user in group.</li>
+<li><strong>User mounts:</strong> each entry configures a mount for a single user or for all
+users.</li>
+</ul>
+<p>For each type, there is a JSON array with the user/group name as key, and an
+array of configuration entries as value. Each entry consist of the class name
+of the storage backend and an array of backend specific options and will be
+replaced by the user login. The template <strong>$user</strong> can be used in the mount
+point or backend options. As of writing the following storage backends are
+available for use:</p>
+<ul class="simple">
+<li>Local file system</li>
+<li>FTP (or FTPS)</li>
+<li>SFTP</li>
+<li>SMB</li>
+<li>WebDAV</li>
+<li><a class="reference external" href="http://aws.amazon.com/de/s3/">Amazon S3</a></li>
+<li><a class="reference external" href="https://www.dropbox.com/">Dropbox</a></li>
+<li><a class="reference external" href="https://drive.google.com/start">Google Drive</a></li>
+<li><a class="reference external" href="http://openstack.org/projects/storage/">OpenStack Swift</a></li>
+</ul>
+<p>Please keep in mind that some formatting has been applied and carriage returns
+have been added for better readability. In the <tt class="file docutils literal"><span class="pre">data/mount.json</span></tt> all
+values need to be concatenated and written in a row without these modifications!</p>
+<p>It is recommended to use the <a class="reference internal" href="custom_mount_config_gui.html"><em>Web-GUI</em></a> in the
+administrator panel to add, remove or modify mount options to prevent any problems!</p>
+<div class="section" id="example">
+<h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-json"><pre>{"group":{
+ "admin":{
+ "\/$user\/files\/Admin_Stuff":{
+ "class":"\\OC\\Files\\Storage\\Local",
+ "options":{ ... }
+ }
+ }
+ }
+ "user":{
+ "all":{
+ "\/$user\/files\/Pictures":{
+ "class":"\\OC\\Files\\Storage\\DAV",
+ "options":{ ... }
+ }
+ }
+ "someuser":{
+ "\/someuser\/files\/Music":{
+ "class":"\\OC\\Files\\Storage\\FTP",
+ "options":{ ... }
+ }
+ }
+ }
+}</pre>
+</div>
+</div>
+<div class="section" id="backends">
+<h2>Backends<a class="headerlink" href="#backends" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="local-filesystem">
+<h3>Local Filesystem<a class="headerlink" href="#local-filesystem" title="Permalink to this headline">¶</a></h3>
+<p>The local filesystem backend mounts a folder on the server into the virtual
+filesystem, the class to be used is <strong>\OC\Files\Storage\Local</strong> and
+takes the following options:</p>
+<ul class="simple">
+<li><strong>datadir</strong> : the path to the local directory to be mounted</li>
+</ul>
+<div class="section" id="id1">
+<h4>Example<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Local"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span> <span class="nt">"datadir"</span><span class="p">:</span><span class="s2">"\/mnt\/additional_storage"</span> <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You must ensure that the web server has sufficient permissions on the folder.</p>
+</div>
+</div>
+</div>
+<div class="section" id="ftp-or-ftps">
+<h3>FTP (or FTPS)<a class="headerlink" href="#ftp-or-ftps" title="Permalink to this headline">¶</a></h3>
+<p>The FTP backend mounts a folder on a remote FTP server into the virtual
+filesystem and is part of the ‘External storage support’ app, the class
+to be used is <strong>\OC\Files\Storage\FTP</strong> and takes the following
+options:</p>
+<ul class="simple">
+<li><strong>host</strong>: the hostname of the ftp server</li>
+<li><strong>user</strong>: the username used to login on the ftp server</li>
+<li><strong>password</strong>: the password to login on the ftp server</li>
+<li><strong>secure</strong>: whether to use ftps:// (FTP over TLS) to connect to the ftp
+server instead of ftp:// (optional, defaults to false)</li>
+<li><strong>root</strong>: the folder inside the ftp server to mount (optional, defaults
+to ‘/’)</li>
+</ul>
+<div class="section" id="id2">
+<h4>Example<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\FTP"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"host"</span><span class="p">:</span><span class="s2">"ftp.myhost.com"</span><span class="p">,</span>
+ <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
+ <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Videos"</span><span class="p">,</span>
+ <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"false"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">PHP needs to be build with FTP support for this backend to work.</p>
+</div>
+</div>
+</div>
+<div class="section" id="sftp">
+<h3>SFTP<a class="headerlink" href="#sftp" title="Permalink to this headline">¶</a></h3>
+<p>The SFTP backend mounts a folder on a remote SSH server into the virtual
+filesystem and is part of the ‘External storage support’ app. The class
+to be used is <strong>\OC\Files\Storage\SFTP</strong> and takes the following
+options:</p>
+<ul class="simple">
+<li><strong>host</strong>: the hostname of the SSH server</li>
+<li><strong>user</strong>: the username used to login to the SSH server</li>
+<li><strong>password</strong>: the password to login on the SSH server</li>
+<li><strong>root</strong>: the folder inside the SSH server to mount (optional, defaults
+to ‘/’)</li>
+</ul>
+<div class="section" id="id3">
+<h4>Example<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SFTP"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"host"</span><span class="p">:</span><span class="s2">"ssh.myhost.com"</span><span class="p">,</span>
+ <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
+ <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Books"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">PHP needs to be build with SFTP support for this backend to work.</p>
+</div>
+</div>
+</div>
+<div class="section" id="smb">
+<h3>SMB<a class="headerlink" href="#smb" title="Permalink to this headline">¶</a></h3>
+<p>The SMB backend mounts a folder on a remote Samba server, a NAS appliance or
+a Windows machine into the virtual file system. It is part of the ‘External
+storage support’ app, the class to be used is <strong>\OC\Files\Storage\SMB</strong> and
+takes the following options:</p>
+<ul class="simple">
+<li><strong>host</strong>: the host name of the samba server</li>
+<li><strong>user</strong>: the user name used to login on the samba server</li>
+<li><strong>password</strong>: the password to login on the samba server</li>
+<li><strong>share</strong>: the share on the samba server to mount</li>
+<li><strong>root</strong>: the folder inside the samba share to mount (optional, defaults
+to ‘/’)</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The SMB backend requires <strong>smbclient</strong> to be installed on the server.</p>
+</div>
+<div class="section" id="id4">
+<h4>Example<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SMB"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"host"</span><span class="p">:</span><span class="s2">"myhost.com"</span><span class="p">,</span>
+ <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
+ <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"share"</span><span class="p">:</span><span class="s2">"\/test"</span><span class="p">,</span>
+ <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Pictures"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="webdav">
+<h3>WebDAV<a class="headerlink" href="#webdav" title="Permalink to this headline">¶</a></h3>
+<p>The WebDAV backend mounts a folder on a remote WebDAV server into the
+virtual filesystem and is part of the ‘External storage support’ app,
+the class to be used is <strong>\OC\Files\Storage\DAV</strong> and takes the
+following options:</p>
+<ul class="simple">
+<li><strong>host</strong>: the hostname of the webdav server.</li>
+<li><strong>user</strong>: the username used to login on the webdav server</li>
+<li><strong>password</strong>: the password to login on the webdav server</li>
+<li><strong>secure</strong>: whether to use <a class="reference external" href="https://">https://</a> to connect to the webdav server
+instead of <a class="reference external" href="http://">http://</a> (optional, defaults to false)</li>
+<li><strong>root</strong>: the folder inside the webdav server to mount (optional,
+defaults to ‘/’)</li>
+</ul>
+<div class="section" id="id5">
+<h4>Example<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\DAV"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"host"</span><span class="p">:</span><span class="s2">"myhost.com\/webdav.php"</span><span class="p">,</span>
+ <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
+ <span class="nt">"password"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"true"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="amazon-s3">
+<h3>Amazon S3<a class="headerlink" href="#amazon-s3" title="Permalink to this headline">¶</a></h3>
+<p>The Amazon S3 backend mounts a bucket in the Amazon cloud into the virtual
+filesystem and is part of the ‘External storage support’ app, the class to
+be used is <strong>\OC\Files\Storage\AmazonS3</strong> and takes the following
+options:</p>
+<ul class="simple">
+<li><strong>key</strong>: the key to login to the Amazon cloud</li>
+<li><strong>secret</strong>: the secret to login to the Amazon cloud</li>
+<li><strong>bucket</strong>: the bucket in the Amazon cloud to mount</li>
+</ul>
+<div class="section" id="id6">
+<h4>Example<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\AmazonS3"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"key"</span><span class="p">:</span><span class="s2">"key"</span><span class="p">,</span>
+ <span class="nt">"secret"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"bucket"</span><span class="p">:</span><span class="s2">"bucket"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="dropbox">
+<h3>Dropbox<a class="headerlink" href="#dropbox" title="Permalink to this headline">¶</a></h3>
+<p>The Dropbox backend mounts a dropbox in the Dropbox cloud into the virtual
+filesystem and is part of the ‘External storage support’ app, the class to
+be used is <strong>\OC\Files\Storage\Dropbox</strong> and takes the following options:</p>
+<ul class="simple">
+<li><strong>configured</strong>: whether the drive has been configured or not (true or false)</li>
+<li><strong>app_key</strong>: the app key to login to your Dropbox</li>
+<li><strong>app_secret</strong>: the app secret to login to your Dropbox</li>
+<li><strong>token</strong>: the OAuth token to login to your Dropbox</li>
+<li><strong>token_secret</strong>: the OAuth secret to login to your Dropbox</li>
+</ul>
+<div class="section" id="id7">
+<h4>Example<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Dropbox"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"configured"</span><span class="p">:</span><span class="s2">"#configured"</span><span class="p">,</span>
+ <span class="nt">"app_key"</span><span class="p">:</span><span class="s2">"key"</span><span class="p">,</span>
+ <span class="nt">"app_secret"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"token"</span><span class="p">:</span><span class="s2">"#token"</span><span class="p">,</span>
+ <span class="nt">"token_secret"</span><span class="p">:</span><span class="s2">"#token_secret"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="google-drive">
+<h3>Google Drive<a class="headerlink" href="#google-drive" title="Permalink to this headline">¶</a></h3>
+<p>The Google Drive backend mounts a share in the Google cloud into the virtual
+filesystem and is part of the ‘External storage support’ app, the class to
+be used is <strong>\OC\Files\Storage\Google</strong> and is done via an OAuth2.0 request.
+That means that the App must be registered through the Google APIs Console.
+The result of the registration process is a set of values (incl. client_id, client_secret).
+It takes the following options:</p>
+<ul class="simple">
+<li><strong>configured</strong>: whether the drive has been configured or not (true or false)</li>
+<li><strong>client_id</strong>: the client id to login to the Google drive</li>
+<li><strong>client_secret</strong>: the client secret to login to the Google drive</li>
+<li><strong>token</strong>: a compound value including access and refresh tokens</li>
+</ul>
+<div class="section" id="id8">
+<h4>Example<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\Google"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"configured"</span><span class="p">:</span><span class="s2">"#configured"</span><span class="p">,</span>
+ <span class="nt">"client_id"</span><span class="p">:</span><span class="s2">"#client_id"</span><span class="p">,</span>
+ <span class="nt">"client_secret"</span><span class="p">:</span><span class="s2">"#client_secret"</span><span class="p">,</span>
+ <span class="nt">"token"</span><span class="p">:</span><span class="s2">"#token"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="openstack-swift">
+<h3>OpenStack Swift<a class="headerlink" href="#openstack-swift" title="Permalink to this headline">¶</a></h3>
+<p>The Swift backend mounts a container on an OpenStack Object Storage server
+into the virtual filesystem and is part of the ‘External storage support’
+app, the class to be used is <strong>\OC\Files\Storage\SWIFT</strong> and takes
+the following options:</p>
+<ul class="simple">
+<li><strong>host</strong>: the hostname of the authentication server for the swift
+storage.</li>
+<li><strong>user</strong>: the username used to login on the swift server</li>
+<li><strong>token</strong>: the authentication token to login on the swift server</li>
+<li><strong>secure</strong>: whether to use ftps:// to connect to the swift server instead
+of ftp:// (optional, defaults to false)</li>
+<li><strong>root</strong>: the container inside the swift server to mount (optional,
+defaults to ‘/’)</li>
+</ul>
+<div class="section" id="id9">
+<h4>Example<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-json"><div class="highlight"><pre><span class="p">{</span> <span class="nt">"class"</span><span class="p">:</span><span class="s2">"\\OC\\Files\\Storage\\SWIFT"</span><span class="p">,</span>
+ <span class="nt">"options"</span><span class="p">:{</span>
+ <span class="nt">"host"</span><span class="p">:</span><span class="s2">"swift.myhost.com\/auth"</span><span class="p">,</span>
+ <span class="nt">"user"</span><span class="p">:</span><span class="s2">"johndoe"</span><span class="p">,</span>
+ <span class="nt">"token"</span><span class="p">:</span><span class="s2">"secret"</span><span class="p">,</span>
+ <span class="nt">"root"</span><span class="p">:</span><span class="s2">"\/Videos"</span><span class="p">,</span>
+ <span class="nt">"secure"</span><span class="p">:</span><span class="s2">"true"</span>
+ <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/custom_mount_config_gui.html
index 6d8df69,0000000..d99c89a
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_mount_config_gui.html
+++ b/core/doc/admin/configuration/custom_mount_config_gui.html
@@@ -1,235 -1,0 +1,235 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Custom Mount Configuration Web-GUI — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Custom Mount Configuration" href="custom_mount_config.html" />
+ <link rel="prev" title="Uploading big files > 512MB (as set by default)" href="configuring_big_file_upload.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Custom Mount Configuration Web-GUI</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Dropbox</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Google Drive</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="custom-mount-configuration-web-gui">
+<h1>Custom Mount Configuration Web-GUI<a class="headerlink" href="#custom-mount-configuration-web-gui" title="Permalink to this headline">¶</a></h1>
+<p>Since ownCloud 5.0 it is possible to mount external storage providers into
+ownCloud’s virtual file system. To add an external storage backend to your
+ownCloud head to <em>Settings</em> -> <em>Admin</em> or <em>Personal</em>. As administrator you
+can mount external storage for any group or user. Users are also allowed
+to mount external storage for themselves if this setting has been enabled
+by the administrator.</p>
+<div class="figure">
+<img alt="../_images/custom_mount_config_gui-1.png" src="../_images/custom_mount_config_gui-1.png" />
+</div>
+<p>At first the mount point has to be entered, this is the directory in ownCloud’s
+virtual file system, that the storage will be mounted to. Then the storage
+backend has to be selected from the list of supported backends. As of writing
+ownCloud currently supports the following storage backends:</p>
+<div class="figure">
+<img alt="../_images/custom_mount_config_gui-2.png" src="../_images/custom_mount_config_gui-2.png" />
+</div>
+<ul class="simple">
+<li>Local file system (mount local storage that is outside ownCloud’s data
+directory)</li>
+<li>FTP (or FTPS)</li>
+<li>SFTP</li>
+<li>SMB</li>
+<li>WebDAV</li>
+<li><a class="reference external" href="http://aws.amazon.com/de/s3/">Amazon S3</a></li>
+<li><a class="reference external" href="https://www.dropbox.com/">Dropbox</a></li>
+<li><a class="reference external" href="https://drive.google.com/start">Google Drive</a></li>
+<li><a class="reference external" href="http://openstack.org/projects/storage/">OpenStack Swift</a></li>
+</ul>
+<p>Please keep in mind, that users are not allowed to mount local file storage for
+security purposes.</p>
+<div class="figure">
+<img alt="../_images/custom_mount_config_gui-3.png" src="../_images/custom_mount_config_gui-3.png" />
+</div>
+<div class="figure">
+<img alt="../_images/custom_mount_config_gui-4.png" src="../_images/custom_mount_config_gui-4.png" />
+</div>
+<p>Once a backend has been selected, more configuration fields will appear. The
+displayed configuration fields may vary depending on the selected storage backend.
+For example, the FTP storage backend needs the following configuration details
+to be entered:</p>
+<ul class="simple">
+<li><strong>host</strong>: the hostname of the ftp server</li>
+<li><strong>user</strong>: the username used to login to the ftp server</li>
+<li><strong>password</strong>: the password to login to the ftp server</li>
+<li><strong>secure</strong>: whether to use ftps:// (FTP over TLS) to connect to the ftp
+server instead of ftp:// (optional, defaults to false)</li>
+<li><strong>root</strong>: the name of the folder inside the ftp server to mount (optional,
+defaults to ‘/’)</li>
+</ul>
+<div class="section" id="id1">
+<h2>Dropbox<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<p>Mounting a Dropbox account requires that you create an app with Dropbox and then provide the app key and secret to the
+external storage configuration user interface. Go to My apps at Dropbox and create an app. Select <em>Full Dropbox</em> access
+level. Copy the app key and app secret and paste them into the corresponding fields for the Dropbox storage.</p>
+<p>Click the <em>Grant access</em> button and you will be redirected to a Dropbox website to give ownCloud permission to access your account.</p>
+</div>
+<div class="section" id="id2">
+<h2>Google Drive<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<p>For a detailed step-by-step guide read <a class="reference external" href="../../user_manual/external_storage/google_drive.html">User Manual</a></p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/custom_user_backend.html
index 360b0c8,0000000..942656d
mode 100644,000000..100644
--- a/core/doc/admin/configuration/custom_user_backend.html
+++ b/core/doc/admin/configuration/custom_user_backend.html
@@@ -1,254 -1,0 +1,254 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Custom User Backend Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Serving static files via web server" href="xsendfile.html" />
+ <link rel="prev" title="Custom Mount Configuration" href="custom_mount_config.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Custom User Backend Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#imap">IMAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#smb">SMB</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="custom-user-backend-configuration">
+<h1>Custom User Backend Configuration<a class="headerlink" href="#custom-user-backend-configuration" title="Permalink to this headline">¶</a></h1>
+<p>Starting with ownCloud 4.5 is possible to configure additional user backends
+in ownCloud’s configuration <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> using the following
+syntax:</p>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"class"</span> <span class="o">=></span> <span class="o">...</span><span class="p">,</span>
+ <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="o">...</span>
+ <span class="p">),</span>
+ <span class="p">),</span>
+<span class="p">),</span>
+</pre></div>
+</div>
+<p>Currently the “External user support” (user_external) app provides the following user backends:</p>
+<div class="section" id="imap">
+<h2>IMAP<a class="headerlink" href="#imap" title="Permalink to this headline">¶</a></h2>
+<p>Provides authentication against IMAP servers</p>
+<ul class="simple">
+<li><strong>Class:</strong> OC_User_IMAP</li>
+<li><strong>Arguments:</strong> a mailbox string as defined <a class="reference external" href="http://www.php.net/manual/en/function.imap-open.php">in the PHP documention</a></li>
+<li><strong>Example:</strong></li>
+</ul>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"class"</span> <span class="o">=></span> <span class="s2">"OC_User_IMAP"</span><span class="p">,</span>
+ <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="s1">'{imap.gmail.com:993/imap/ssl}'</span>
+ <span class="p">),</span>
+ <span class="p">),</span>
+<span class="p">),</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="smb">
+<h2>SMB<a class="headerlink" href="#smb" title="Permalink to this headline">¶</a></h2>
+<p>Provides authentication against Samba servers</p>
+<ul class="simple">
+<li><strong>Class:</strong> OC_User_SMB</li>
+<li><strong>Arguments:</strong> the samba server to authenticate against</li>
+<li><strong>Example:</strong></li>
+</ul>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"class"</span> <span class="o">=></span> <span class="s2">"OC_User_SMB"</span><span class="p">,</span>
+ <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="s1">'localhost'</span>
+ <span class="p">),</span>
+ <span class="p">),</span>
+<span class="p">),</span>
+</pre></div>
+</div>
+<div class="section" id="ftp">
+<h3>FTP<a class="headerlink" href="#ftp" title="Permalink to this headline">¶</a></h3>
+<p>Provides authentication against FTP servers</p>
+<ul class="simple">
+<li><strong>Class:</strong> OC_User_FTP</li>
+<li><strong>Arguments:</strong> the FTP server to authenticate against</li>
+<li><strong>Example:</strong></li>
+</ul>
+<div class="highlight-php"><div class="highlight"><pre><span class="cp"><?php</span>
+
+<span class="s2">"user_backends"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="s2">"class"</span> <span class="o">=></span> <span class="s2">"OC_User_FTP"</span><span class="p">,</span>
+ <span class="s2">"arguments"</span> <span class="o">=></span> <span class="k">array</span> <span class="p">(</span>
+ <span class="mi">0</span> <span class="o">=></span> <span class="s1">'localhost'</span>
+ <span class="p">),</span>
+ <span class="p">),</span>
+<span class="p">),</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/index.html
index a4294ae,0000000..4d64ba0
mode 100644,000000..100644
--- a/core/doc/admin/configuration/index.html
+++ b/core/doc/admin/configuration/index.html
@@@ -1,196 -1,0 +1,196 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="next" title="Apps Configuration" href="configuration_apps.html" />
+ <link rel="prev" title="PageKite Configuration" href="../installation/installation_others.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="configuration">
+<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l1"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l1"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l1"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="xsendfile.html">Serving static files via web server</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/configuration/xsendfile.html
index 78df82c,0000000..75fd643
mode 100644,000000..100644
--- a/core/doc/admin/configuration/xsendfile.html
+++ b/core/doc/admin/configuration/xsendfile.html
@@@ -1,290 -1,0 +1,290 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Serving static files via web server — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Configuration" href="index.html" />
+ <link rel="next" title="Maintenance" href="../maintenance/index.html" />
+ <link rel="prev" title="Custom User Backend Configuration" href="custom_user_backend.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="configuration_apps.html">Apps Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_users.html">User Management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="auth_ldap.html">User Authentication with LDAP</a></li>
+<li class="toctree-l2"><a class="reference internal" href="background_jobs.html">Background Jobs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_3rdparty.html">3rd-Party Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_automation.html">Automatic Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_custom_clients.html">Custom Client Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_database.html">Database Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_encryption.html">Use Server-Side Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_knowledgebase.html">Knowledge Base Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_language.html">Language Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_logging.html">Logging Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_mail.html">Mail Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_maintenance.html">Maintenance Mode Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_preview.html">Preview Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_reverseproxy.html">Reverse Proxy Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_mount_config.html">Custom Mount Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="custom_user_backend.html">Custom User Backend Configuration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Serving static files via web server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="serving-static-files-via-web-server">
+<h1>Serving static files via web server<a class="headerlink" href="#serving-static-files-via-web-server" title="Permalink to this headline">¶</a></h1>
+<p>Since ownCloud 5 it is possible to let web servers handle static file serving.
+This should generally improve performance (web servers are optimized for this) and in some cases permits controlled
+file serving (i.e. pause and resume downloads).</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This feature can currently only be activated for local files, i.e. files inside the <strong>data/</strong> directory</p>
+</div>
+<p>and local mounts. Controlled file serving <strong>does not work for generated zip files</strong>. This is due to how temporary files are created.</p>
+<div class="section" id="apache2-x-sendfile">
+<h2>Apache2 (X-Sendfile)<a class="headerlink" href="#apache2-x-sendfile" title="Permalink to this headline">¶</a></h2>
+<p>It is possible to let Apache handle static file serving via <a class="reference external" href="https://tn123.org/mod_xsendfile/">mod_xsendfile</a>.</p>
+<div class="section" id="installation">
+<h3>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h3>
+<p>On Debian and Ubuntu systems use:</p>
+<div class="highlight-bash"><div class="highlight"><pre>apt-get install libapache2-mod-xsendfile
+</pre></div>
+</div>
+</div>
+<div class="section" id="configuration">
+<h3>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h3>
+<p>Configuration of mod_xsendfile for ownCloud depends on its version.
+For versions below 0.10 (Debian squeeze ships with 0.9)</p>
+<div class="highlight-xml"><pre><Directory /var/www/owncloud>
+ ...
+ SetEnv MOD_X_SENDFILE_ENABLED 1
+ XSendFile On
+ XSendFileAllowAbove On
+</Directory></pre>
+</div>
+<p>For versions >=0.10 (e.g. Ubuntu 12.10)</p>
+<div class="highlight-xml"><pre><Directory /var/www/owncloud>
+ ...
+ SetEnv MOD_X_SENDFILE_ENABLED 1
+ XSendFile On
+ XSendFilePath /tmp/oc-noclean
+ XSendFilePath /home/valerio
+</Directory></pre>
+</div>
+<ul class="simple">
+<li><strong>SetEnv MOD_X_SENDFILE_ENABLED</strong>: tells ownCloud scripts that they should add the X-Sendfile header when serving files</li>
+<li><strong>XSendFile</strong>: enables web server handling of X-Sendfile headers (and therefore file serving) for the specified Directory</li>
+<li><strong>XSendFileAllowAbove (<0.10)</strong>: enables file serving through web server on path outside the specified Directory. This is needed for PHP temporary directory where zip files are created and for configured local mounts which may reside outside data directory</li>
+<li><strong>XSendFilePath (>=0.10)</strong>: a white list of paths that the web server is allowed to serve outside of the specified Directory. At least PHP temporary directory concatenated with <em>oc-noclean</em> must be configured. Temporary zip files will be created inside this directory when using mod_xsendfile. Other paths which correspond to local mounts should be configured here as well. For a more in-dept documentation of this directive refer to mod_xsendfile website linked a [...]
+</ul>
+</div>
+</div>
+<div class="section" id="lighttpd-x-sendfile2">
+<h2>LigHTTPd (X-Sendfile2)<a class="headerlink" href="#lighttpd-x-sendfile2" title="Permalink to this headline">¶</a></h2>
+<p>LigHTTPd uses similar headers to Apache2, apart from the fact that it does not handle partial downloads in the same way
+Apache2 does. For this reason, a different method is used for LigHTTPd.</p>
+<div class="section" id="id1">
+<h3>Installation<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>X-Sendfile and X-Sendfile2 are supported by default in LigHTTPd and no additional operation should be needed to install it.</p>
+</div>
+<div class="section" id="id2">
+<h3>Configuration<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>Your server configuration should include the following statements:</p>
+<div class="highlight-python"><pre>fastcgi.server = ( ".php" => ((
+ ...
+ "allow-x-send-file" => "enable",
+ "bin-environment" => (
+ "MOD_X_SENDFILE2_ENABLED" => "1",
+ ),
+)))</pre>
+</div>
+<ul class="simple">
+<li><strong>allow-x-send-file</strong>: enables LigHTTPd to use X-Sendfile and X-Sendfile2 headers to serve files</li>
+<li><strong>bin-environment</strong>: is used to parse MOD_X_SENDFILE2_ENABLED to the ownCloud backend, to make it use the X-Sendfile and X-Sendfile2 headers in it’s response</li>
+</ul>
+</div>
+</div>
+<div class="section" id="nginx-x-accel-redirect">
+<h2>Nginx (X-Accel-Redirect)<a class="headerlink" href="#nginx-x-accel-redirect" title="Permalink to this headline">¶</a></h2>
+<p>Nginx supports handling of static files differently from Apache. Documentation can be found in the Nginx Wiki
+section <a class="reference external" href="http://wiki.nginx.org/XSendfile">Mod X-Sendfile</a> and section <a class="reference external" href="http://wiki.nginx.org/X-accel">X-Accell</a>.
+The header used by Nginx is X-Accel-Redirect.</p>
+<div class="section" id="id3">
+<h3>Installation<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>X-Accel-Redirect is supported by default in Nginx and no additional operation should be needed to install it.</p>
+</div>
+<div class="section" id="id4">
+<h3>Configuration<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>Configuration is similar to Apache:</p>
+<div class="highlight-python"><pre>location ~ \.php$ {
+ ...
+ fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
+}
+
+location ~ ^/home/valerio/(owncloud/)?data {
+ internal;
+ root /;
+}
+
+location ~ ^/tmp/oc-noclean/.+$ {
+ internal;
+ root /;
+}</pre>
+</div>
+<ul class="simple">
+<li><strong>fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED:</strong> tells ownCloud scripts that they should add the X-Accel-Redirect header when serving files</li>
+<li><strong>internal location:</strong> each directory that contains local user data should correspond to an internal location. In the example uses the following directories:<ul>
+<li><strong>/home/valerio/owncloud/data</strong>: ownCloud data directory</li>
+<li><strong>/home/valerio/data</strong>: a local mount</li>
+<li><strong>/tmp/oc-noclean</strong>: PHP temporary directory concatenated with <em>oc-noclean</em>. Temporary zip files will be created inside this directory when using X-Accel-Redirect</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="how-to-check-if-it-s-working">
+<h2>How to check if it’s working?<a class="headerlink" href="#how-to-check-if-it-s-working" title="Permalink to this headline">¶</a></h2>
+<p>You are still able to download stuff via the web interface and single, local file downloads can be paused and resumed.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/contents.html
index fe6be93,0000000..a9a6a44
mode 100644,000000..100644
--- a/core/doc/admin/contents.html
+++ b/core/doc/admin/contents.html
@@@ -1,336 -1,0 +1,336 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud documentation contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
- <link rel="next" title="Admin Documentation" href="index.html" />
++ <link rel="next" title="ownCloud 6.0 Admin Documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="#">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-documentation-contents">
+<span id="contents"></span><h1>ownCloud documentation contents<a class="headerlink" href="#owncloud-documentation-contents" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+</div>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_appliance.html">Appliances</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#software-appliances">Software Appliances</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_appliance.html#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_linux.html">Linux Distributions</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_linux.html#supported-distribution-packages">Supported Distribution Packages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_windows.html">Windows 7 and Windows Server 2008</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-php">Installing PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-mysql">Installing MySQL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#installing-owncloud">Installing ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb handling</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_windows.html#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_ucs.html">Univention Corporate Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_ucs.html#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_source.html">Manual Installation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#download-extract-and-copy-owncloud-to-your-web-server">Download, extract and copy ownCloud to Your Web Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#set-the-directory-permissions">Set the Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#web-server-configuration">Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation/installation_source.html#follow-the-install-wizard">Follow the Install Wizard</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_apps.html">Apps Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_apps.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_users.html">User Management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#users">Users</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_users.html#user-groups">User Groups</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/auth_ldap.html">User Authentication with LDAP</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#configuration">Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#advanced-settings">Advanced Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#expert-settings">Expert Settings</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#testing-the-configuration">Testing the configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-avatar-integration">ownCloud Avatar integration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#troubleshooting-tips-and-tricks">Troubleshooting, Tips and Tricks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#ssl-certificate-verification-ldaps-tls">SSL Certificate Verification (LDAPS, TLS)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#microsoft-active-directory">Microsoft Active Directory</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#duplicating-server-configurations">Duplicating Server Configurations</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#owncloud-ldap-internals">ownCloud LDAP Internals</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#groups">Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#user-and-group-mapping">User and Group Mapping</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#caching">Caching</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/auth_ldap.html#handling-with-backup-server">Handling with Backup Server</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/background_jobs.html">Background Jobs</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/background_jobs.html#cron-jobs">Cron-Jobs</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_3rdparty.html">3rd-Party Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_3rdparty.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_automation.html">Automatic Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_automation.html#sample-automatic-configurations">Sample Automatic Configurations</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_custom_clients.html">Custom Client Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_custom_clients.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_database.html">Database Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_database.html#trouble-shooting">Trouble Shooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_encryption.html">Use Server-Side Encryption</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#enable-file-recovery-feature">Enable File Recovery Feature</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#recover-user-files">Recover User Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_encryption.html#ldap-and-other-external-user-back-ends">LDAP and other external user back-ends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_knowledgebase.html">Knowledge Base Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_knowledgebase.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_language.html">Language Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_language.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_logging.html">Logging Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_logging.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_mail.html">Mail Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#requirements">Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#send-a-test-email">Send a Test Email</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_mail.html#trouble-shooting">Trouble shooting</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_maintenance.html">Maintenance Mode Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_maintenance.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_preview.html">Preview Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_preview.html#soft-dependencies">Soft dependencies:</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_preview.html#parameters">Parameters</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_reverseproxy.html">Reverse Proxy Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuration_reverseproxy.html#example">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_big_file_upload.html">Uploading big files > 512MB (as set by default)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#not-outnumberable-upload-limits">Not outnumberable upload limits:</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/configuring_big_file_upload.html#other-recommendable-preconditions">Other recommendable preconditions:</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuring_big_file_upload.html#enabling-uploading-big-files">Enabling uploading big files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config_gui.html">Custom Mount Configuration Web-GUI</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#id1">Dropbox</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config_gui.html#id2">Google Drive</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_mount_config.html">Custom Mount Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_mount_config.html#backends">Backends</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/custom_user_backend.html">Custom User Backend Configuration</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#imap">IMAP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/custom_user_backend.html#smb">SMB</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/xsendfile.html">Serving static files via web server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#apache2-x-sendfile">Apache2 (X-Sendfile)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#lighttpd-x-sendfile2">LigHTTPd (X-Sendfile2)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#nginx-x-accel-redirect">Nginx (X-Accel-Redirect)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="configuration/xsendfile.html#how-to-check-if-it-s-working">How to check if it’s working?</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/backup.html">Backing up ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-folders">Backup Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/backup.html#backup-database">Backup Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/update.html">Updating ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#update">Update</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/update.html#upgrade">Upgrade</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/restore.html">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="maintenance/restore.html#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="maintenance/migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+</div>
+<div class="section" id="indices-and-tables">
+<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/cron/Introduction.html
index 6f938d5,0000000..9539f6e
mode 100644,000000..100644
--- a/core/doc/admin/cron/Introduction.html
+++ b/core/doc/admin/cron/Introduction.html
@@@ -1,146 -1,0 +1,146 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud is written in PHP, and because PHP is a request driven language – in other words it runs only when a client takes an action and calls php, and then it executes and ends – it does not have a built in CRON process. Instead, ownCloud provides Cron.php, which is called by the server’s CRON daemon. Cron.php is an ownCloud internal process that runs various background jobs on demand.
+It is called by the server cron, and can be set by the administrator. ownCloud plug-in applications register actions with cron.php automatically to take care of typical housekeeping operations, such as garbage collecting of temporary files or checking for newly updated files using filescan() for externally mounted file systems.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/cron/Usage.html
index 5e597dc,0000000..0e8386b
mode 100644,000000..100644
--- a/core/doc/admin/cron/Usage.html
+++ b/core/doc/admin/cron/Usage.html
@@@ -1,154 -1,0 +1,154 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Usage — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="usage">
+<h1>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h1>
+<p>The interval at which this script is executed, and thus the ownCloud registered actions, can depend on the size of the installation and the load of the system.
+Recommended intervals are 15 or 30 minutes.</p>
+<p>Cron.php needs to be called by the system’s cron daemon and run as the same user the web server runs as.</p>
+<p>As an example, on an ordinary Linux distribution, place the following in the webserver’s user’s crontab:</p>
+<p>*/15
+*
+*
+*
+* /usr/bin/php -f /srv/http/owncloud/cron.php /dev/null 2>&1</p>
+<p>This will run cron.php every 15 minutes and suppress any warnings or output which may be generated.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/cron/index.html
index be33609,0000000..1e32757
mode 100644,000000..100644
--- a/core/doc/admin/cron/index.html
+++ b/core/doc/admin/cron/index.html
@@@ -1,148 -1,0 +1,148 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud cron.php</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Usage.html">Usage</a></li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/genindex.html
index 7934a01,0000000..7ae01da
mode 100644,000000..100644
--- a/core/doc/admin/genindex.html
+++ b/core/doc/admin/genindex.html
@@@ -1,149 -1,0 +1,149 @@@
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Index — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+
+<h1 id="index">Index</h1>
+
+<div class="genindex-jumpbox">
+
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/index.html
index 4d44f72,7785f2c..b0a5342
--- a/core/doc/admin/index.html
+++ b/core/doc/admin/index.html
@@@ -1,226 -1,2 +1,226 @@@
-Here goes the admin documentation.
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
- <title>Admin Documentation — ownCloud Administrators Manual 6.0 documentation</title>
++ <title>ownCloud 6.0 Admin Documentation — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="#" />
+ <link rel="next" title="Installation" href="installation/index.html" />
+ <link rel="prev" title="ownCloud documentation contents" href="contents.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul class="current">
- <li class="toctree-l1 current"><a class="current reference internal" href="">Admin Documentation</a><ul>
++<li class="toctree-l1 current"><a class="current reference internal" href="">ownCloud 6.0 Admin Documentation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#target-audience">Target audience</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#structure-of-this-document">Structure of this document</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#installation">Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#configuration">Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#maintenance">Maintenance</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
- <div class="section" id="admin-documentation">
- <h1>Admin Documentation<a class="headerlink" href="#admin-documentation" title="Permalink to this headline">¶</a></h1>
++ <div class="section" id="owncloud-version-admin-documentation">
++<h1>ownCloud 6.0 Admin Documentation<a class="headerlink" href="#owncloud-version-admin-documentation" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="introduction">
+<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
+<p>This is the administrators manual for ownCloud, a flexible, open source file
+sync and share solution. It comprises of the ownCloud server, as well as client
+applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and
+mobile clients for the Android and Apple iOS operating system.</p>
+<div class="section" id="target-audience">
+<h3>Target audience<a class="headerlink" href="#target-audience" title="Permalink to this headline">¶</a></h3>
+<p>This guide is targeted towards people who want to install, administer and
+optimize ownCloud Server. If you want to learn how to use the Web UI, or how to
+install clients on the server, please refer to the <a class="reference external" href="http://doc.owncloud.com/">User Manual</a> or the <a class="reference external" href="http://doc.owncloud.com/">Desktop
+Client Manual</a> respectively.</p>
+</div>
+<div class="section" id="structure-of-this-document">
+<h3>Structure of this document<a class="headerlink" href="#structure-of-this-document" title="Permalink to this headline">¶</a></h3>
+<p>The next chapters describes how to set up ownCloud Server on different platforms
+and operating systems, as well as how to update existing installations.</p>
+<p>Further chapters will then detail on integrating ownCloud into your existing
+environment, e.g. how to setup LDAP or how to mount your storage.</p>
+</div>
+</div>
+<div class="section" id="installation">
+<h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
+<p>This chapter will introduce you to the installation of ownCloud in different scenarios.</p>
+<p>If you want to just try ownCloud in a virtual machine without any configuration, check the section
+<a class="reference internal" href="installation/installation_appliance.html"><em>Appliances</em></a>, where you will find ready-to-use images.</p>
+<ul class="simple">
+<li><a class="reference internal" href="installation/installation_linux.html"><em>Linux Distributions</em></a> (recommended)</li>
+<li><a class="reference internal" href="installation/installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a></li>
+<li><a class="reference internal" href="installation/installation_source.html"><em>Manual Installation</em></a></li>
+<li><a class="reference internal" href="installation/installation_others.html"><em>PageKite Configuration</em></a></li>
+<li><a class="reference internal" href="installation/installation_ucs.html"><em>Univention Corporate Server</em></a></li>
+<li><a class="reference internal" href="installation/installation_macos.html"><em>Mac OS X</em></a> (not supported)</li>
+<li><a class="reference internal" href="installation/installation_appliance.html"><em>Appliances</em></a></li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
+<p>This chapter covers ownCloud and web server configuration.</p>
+<ul class="simple">
+<li><a class="reference internal" href="configuration/configuration_apps.html"><em>Apps Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_users.html"><em>User Management</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_database.html"><em>Database Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/auth_ldap.html"><em>User Authentication with LDAP</em></a></li>
+<li><a class="reference internal" href="configuration/custom_mount_config_gui.html"><em>Custom Mount Configuration Web-GUI</em></a></li>
+<li><a class="reference internal" href="configuration/custom_mount_config.html"><em>Custom Mount Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/background_jobs.html"><em>Background Jobs</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_mail.html"><em>Mail Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_automation.html"><em>Automatic Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_encryption.html"><em>Use Server-Side Encryption</em></a></li>
+<li><a class="reference internal" href="configuration/configuring_big_file_upload.html"><em>Uploading big files > 512MB (as set by default)</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_reverseproxy.html"><em>Reverse Proxy Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/xsendfile.html"><em>Serving static files via web server</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_3rdparty.html"><em>3rd-Party Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/custom_user_backend.html"><em>Custom User Backend Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_custom_clients.html"><em>Custom Client Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_maintenance.html"><em>Maintenance Mode Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_knowledgebase.html"><em>Knowledge Base Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_logging.html"><em>Logging Configuration</em></a></li>
+<li><a class="reference internal" href="configuration/configuration_language.html"><em>Language Configuration</em></a></li>
+</ul>
+</div>
+<div class="section" id="maintenance">
+<h2>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h2>
+<p>This chapter covers maintenance tasks such as updating or migrating to a new version.</p>
+<ul class="simple">
+<li><a class="reference internal" href="maintenance/migrating.html"><em>Migrating ownCloud Installations</em></a></li>
+<li><a class="reference internal" href="maintenance/update.html"><em>Updating ownCloud</em></a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/index.html
index 58c5e27,0000000..cc8010b
mode 100644,000000..100644
--- a/core/doc/admin/installation/index.html
+++ b/core/doc/admin/installation/index.html
@@@ -1,168 -1,0 +1,168 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Installation — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="next" title="Appliances" href="installation_appliance.html" />
- <link rel="prev" title="Admin Documentation" href="../index.html" />
++ <link rel="prev" title="ownCloud 6.0 Admin Documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="installation">
+<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_appliance.html
index b6d1514,0000000..82e78c5
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_appliance.html
+++ b/core/doc/admin/installation/installation_appliance.html
@@@ -1,185 -1,0 +1,185 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Appliances — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Linux Distributions" href="installation_linux.html" />
+ <link rel="prev" title="Installation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Appliances</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#software-appliances">Software Appliances</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#owncloud-on-hardware-appliances">ownCloud on Hardware Appliances</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="appliances">
+<h1>Appliances<a class="headerlink" href="#appliances" title="Permalink to this headline">¶</a></h1>
+<p>If you are looking for virtual machine images, check the Software Appliances
+section. The Hardware Appliances section is of interest for people seeking to
+run ownCloud on appliance hardware (i.e. NAS filers, routers, etc.).</p>
+<div class="section" id="software-appliances">
+<h2>Software Appliances<a class="headerlink" href="#software-appliances" title="Permalink to this headline">¶</a></h2>
+<p>There are number of pre-made virtual machine-based appliances:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://susestudio.com/a/TadMax/owncloud-in-a-box">SUSE Studio, ownCloud on openSuSE</a>, runnable directly from an USB stick.</li>
+<li><a class="reference external" href="http://jujucharms.com/charms/precise/owncloud">Ubuntu charm, ownCloud</a></li>
+</ul>
+</div>
+<div class="section" id="owncloud-on-hardware-appliances">
+<h2>ownCloud on Hardware Appliances<a class="headerlink" href="#owncloud-on-hardware-appliances" title="Permalink to this headline">¶</a></h2>
+<p>These are tutorials provided by the user communities of the respective appliances:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://wiki.qnap.com/wiki/Category:OwnCloud">QNAP Guide</a> for QNAP NAS appliances</li>
+<li><a class="reference external" href="http://wiki.openwrt.org/doc/howto/owncloud">OpenWrt Guide</a> for the popular embedded distribution for routers and NAS devices.</li>
+<li><a class="reference external" href="http://www.cphub.net/index.php?id=40&pid=213">Synology Package</a> for Synology NAS products</li>
+</ul>
+<div class="admonition-todo admonition" id="index-0">
+<p class="first admonition-title">Todo</p>
+<p class="last">Tutorials for running ownCloud on Dreamplug.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_linux.html
index 61d1a79,0000000..5556911
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_linux.html
+++ b/core/doc/admin/installation/installation_linux.html
@@@ -1,172 -1,0 +1,172 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Linux Distributions — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Mac OS X" href="installation_macos.html" />
+ <link rel="prev" title="Appliances" href="installation_appliance.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Linux Distributions</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#supported-distribution-packages">Supported Distribution Packages</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="linux-distributions">
+<h1>Linux Distributions<a class="headerlink" href="#linux-distributions" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="supported-distribution-packages">
+<h2>Supported Distribution Packages<a class="headerlink" href="#supported-distribution-packages" title="Permalink to this headline">¶</a></h2>
+<p>Ready-to-use packages are available at <a class="reference external" href="http://software.opensuse.org/download.html?project=isv:ownCloud:community&package=owncloud">openSUSE Build Service</a> for a variety of Linux distributions.</p>
+<p>If your distribution is not listed please follow <a class="reference internal" href="installation_source.html"><em>Manual Installation</em></a>.</p>
+<div class="section" id="additional-installation-guides-and-notes">
+<h3>Additional installation guides and notes<a class="headerlink" href="#additional-installation-guides-and-notes" title="Permalink to this headline">¶</a></h3>
+<p><strong>Fedora:</strong> Make sure <a class="reference external" href="https://fedoraproject.org/wiki/SELinux_FAQ#How_do_I_enable_or_disable_SELinux_.3F">SELinux is disabled</a>
+or else the installation process might fail.</p>
+<p><strong>Archlinux:</strong> There are two AUR packages for ownCloud: <a class="reference external" href="https://www.archlinux.org/packages/community/any/owncloud/">stable version</a> and <a class="reference external" href="http://aur.archlinux.org/packages.php?ID=38767">development version</a>.</p>
+<p><strong>PCLinuxOS:</strong> Follow the Tutorial <a class="reference external" href="http://pclinuxoshelp.com/index.php/Owncloud,_installation_and_setup">ownCloud, installation and setup</a> on the PCLinuxOS web site.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_macos.html
index e86ac22,0000000..0213942
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_macos.html
+++ b/core/doc/admin/installation/installation_macos.html
@@@ -1,162 -1,0 +1,162 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Mac OS X — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Windows 7 and Windows Server 2008" href="installation_windows.html" />
+ <link rel="prev" title="Linux Distributions" href="installation_linux.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="mac-os-x">
+<h1>Mac OS X<a class="headerlink" href="#mac-os-x" title="Permalink to this headline">¶</a></h1>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Due to an <a class="reference external" href="https://github.com/owncloud/core/issues/2377">issue</a> with Mac OS Unicode support, installing ownCloud Server 6.0 on
+Mac OS is currently not supported.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_others.html
index 525faec,0000000..1a30b31
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_others.html
+++ b/core/doc/admin/installation/installation_others.html
@@@ -1,163 -1,0 +1,163 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>PageKite Configuration — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Configuration" href="../configuration/index.html" />
+ <link rel="prev" title="Manual Installation" href="installation_source.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="pagekite-configuration">
+<h1>PageKite Configuration<a class="headerlink" href="#pagekite-configuration" title="Permalink to this headline">¶</a></h1>
+<p>You can use this <a class="reference external" href="https://pagekite.net/wiki/Howto/GNULinux/OwnCloud/">PageKite how to</a> to make your local ownCloud accessible from the
+internet using PageKite.</p>
+</div>
+<div class="section" id="open-wrt">
+<h1>Open Wrt<a class="headerlink" href="#open-wrt" title="Permalink to this headline">¶</a></h1>
+<p>Here you can find a <a class="reference external" href="http://wiki.openwrt.org/doc/howto/owncloud">tutorial for open Wrt</a></p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_source.html
index 75a5950,0000000..02000c4
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_source.html
+++ b/core/doc/admin/installation/installation_source.html
@@@ -1,655 -1,0 +1,698 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Manual Installation — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="PageKite Configuration" href="installation_others.html" />
+ <link rel="prev" title="Univention Corporate Server" href="installation_ucs.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Manual Installation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#prerequisites">Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#download-extract-and-copy-owncloud-to-your-web-server">Download, extract and copy ownCloud to Your Web Server</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#set-the-directory-permissions">Set the Directory Permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#web-server-configuration">Web Server Configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#follow-the-install-wizard">Follow the Install Wizard</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="manual-installation">
+<h1>Manual Installation<a class="headerlink" href="#manual-installation" title="Permalink to this headline">¶</a></h1>
+<p>If you do not want to use packages, here is how you setup ownCloud on
+from scratch using a classic <abbr title="Linux, Apache, MySQL, PHP">LAMP</abbr> setup:</p>
+<p>This document provides a complete walk-through for installing ownCloud
+on Ubuntu 12.04 LTS Server with Apache and MySQL.
+It also provides guidelines for installing it on other distributions,
+webservers and database systems.</p>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This tutorial assumes you have terminal access to the machine you want
+to install owncloud on. Although this is not an absolute requirement,
+installation without it is highly likely to require contacting your
+hoster (e.g. for installing required modules).</p>
+</div>
+<p>To run ownCloud, your web server must have the following installed:</p>
+<ul class="simple">
+<li>PHP (>= 5.3.3 minimum, 5.4 or higher recommended)</li>
+<li>PHP module ctype</li>
+<li>PHP module dom</li>
+<li>PHP module GD</li>
+<li>PHP module iconv</li>
+<li>PHP module JSON</li>
+<li>PHP module libxml</li>
+<li>PHP module mb multibyte</li>
+<li>PHP module SimpleXML</li>
+<li>PHP module zip</li>
+<li>PHP module zlib</li>
+</ul>
+<p>Database connectors (pick at least one):</p>
+<ul class="simple">
+<li>PHP module sqlite (>= 3, usually not recommendable for performance reasons)</li>
+<li>PHP module mysql</li>
+<li>PHP module pgsql (requires PostgreSQL >= 9.0)</li>
+</ul>
+<p><em>Recommended</em> packages:</p>
+<ul class="simple">
+<li>PHP module curl (highly recommended, some functionality, e.g. http user
+authentication, depends on this)</li>
+<li>PHP module fileinfo (highly recommended, enhances file analysis performance)</li>
+<li>PHP module bz2 (recommended, required for extraction of apps)</li>
+<li>PHP module intl (increases language translation performance)</li>
+<li>PHP module mcrypt (increases file encryption performance)</li>
+<li>PHP module openssl (required for accessing HTTPS resources)</li>
+</ul>
+<p>Required for specific apps (if you use the mentioned app, you must install that
+package):</p>
+<ul class="simple">
+<li>PHP module ldap (for ldap integration)</li>
+<li>smbclient (for SMB storage)</li>
+<li>PHP module ftp (for FTP storage)</li>
+</ul>
+<p>Recommended for specific apps (<em>optional</em>):</p>
+<ul class="simple">
+<li>PHP module exif (for image rotation in pictures app)</li>
+</ul>
+<p>For enhanced performance (<em>optional</em> / select only one of the following):</p>
+<ul class="simple">
+<li>PHP module apc</li>
+<li>PHP module apcu</li>
+<li>PHP module xcache</li>
+</ul>
+<p>For preview generation (<em>optional</em>):</p>
+<ul class="simple">
+<li>PHP module imagick</li>
+<li>avconv or ffmpeg</li>
+<li>OpenOffice or libreOffice</li>
+</ul>
+<p><strong>Remarks:</strong></p>
+<ul>
+<li><p class="first">Please check your distribution, operating system or hosting partner documentation
+on how to install/enable these modules.</p>
+</li>
+<li><p class="first">Make sure your distribution’s php version fulfils the version requirements
+specified above. If it doesn’t, there might be custom repositories you can use.
+If you are e.g. running Ubuntu 10.04 LTS, you can update your
+PHP using a custom <a class="reference external" href="https://launchpad.net/~ondrej/+archive/php5">PHP PPA</a>:</p>
+<div class="highlight-python"><pre>sudo add-apt-repository ppa:ondrej/php5
+sudo apt-get update
+sudo apt-get install php5</pre>
+</div>
+</li>
+<li><p class="first">You don’t need any WebDAV support module for your web server (i.e. Apache’s
+mod_webdav) to access your ownCloud data via WebDAV. ownCloud has a built-in
+WebDAV server of its own.</p>
+</li>
+</ul>
+<div class="section" id="example-installation-on-ubuntu-12-04-4-lts-server">
+<h3>Example installation on Ubuntu 12.04.4 LTS Server<a class="headerlink" href="#example-installation-on-ubuntu-12-04-4-lts-server" title="Permalink to this headline">¶</a></h3>
+<p>On a machine running a pristine Ubuntu 12.04.4 LTS server, you would install the
+required and recommended modules for a typical ownCloud installation, using
+Apache and MySQL by issuing the following commands in a terminal:</p>
+<div class="highlight-python"><pre>sudo apt-get install apache2 mysql-server libapache2-mod-php5
+sudo apt-get install php5-gd php5-json php5-mysql php5-curl
+sudo apt-get install php5-intl php5-mcrypt php5-imagick</pre>
+</div>
+<p><strong>Remarks:</strong></p>
+<ul class="simple">
+<li>If you want to use any other combination of distribution, webserver or database,
+please consult the respective documentation.</li>
+<li>At the execution of each of the above commands you might be prompted whether you
+want to continue; press “Y” for Yes (that is if your system language is English.
+You might have to press a different key if you have a different system language).</li>
+<li>At the installation of the MySQL server, you will be prompted for a root password.
+Be sure to remember that password for later use.</li>
+<li>This installs the packages for the ownCloud core system. If you are planning on
+running additional apps, keep in mind that they might require additional packages.
+See the list above for details.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="download-extract-and-copy-owncloud-to-your-web-server">
+<h2>Download, extract and copy ownCloud to Your Web Server<a class="headerlink" href="#download-extract-and-copy-owncloud-to-your-web-server" title="Permalink to this headline">¶</a></h2>
+<p>First, download the archive of the latest ownCloud version:</p>
+<ul>
+<li><p class="first">Navigate to <cite>http://owncloud.org/install</cite></p>
+</li>
+<li><p class="first">Click “Tar or Zip file”</p>
+</li>
+<li><p class="first">In the opening dialog, chose the “Linux” link.</p>
+</li>
+<li><p class="first">This will start the download of a file named owncloud-x.y.z.tar.bz2 (where
+x.y.z is the version number of the current latest version).</p>
+</li>
+<li><p class="first">Save this file on the machine you want to install ownCloud on.</p>
+</li>
+<li><p class="first">If that’s a different machine than the one you are currently working on, use
+e.g. FTP to transfer the downloaded archive file there.</p>
+</li>
+<li><p class="first">Note down the directory where you put the file.</p>
+</li>
+<li><p class="first">Extract the archive contents. Open a terminal on the machine
+you plan to run ownCloud on, and run:</p>
+<div class="highlight-python"><pre>cd path/to/downloaded/archive
+tar -xjf owncloud-x.y.z.tar.bz2</pre>
+</div>
+<p>where <tt class="code docutils literal"><span class="pre">path/to/downloaded/archive</span></tt> is to be replaced by the path where you
+put the downloaded archive, and x.y.z of course has to be replaced by the actual
+version number as in the file you have downloaded.</p>
+</li>
+<li><p class="first">Copy the ownCloud files to their final destination in the document root of your
+webserver (you can skip this step if you already downloaded and extracted the
+files there):</p>
+<div class="highlight-python"><pre>sudo cp -r owncloud /path/to/your/webserver/document-root</pre>
+</div>
+<ul>
+<li><p class="first">If you don’t know where your webserver’s document root is located, consult its
+documentation. For Apache on Ubuntu 12.04 LTS for example, this would usually be
+<tt class="code docutils literal"><span class="pre">/var/www</span></tt>. So above command should look like this:</p>
+<div class="highlight-python"><pre>sudo cp -r owncloud /var/www</pre>
+</div>
+</li>
+<li><p class="first">The above assumes you want to install ownCloud into a subdirectory “owncloud”
+on your webserver. For installing it anywhere else, you’ll have to adapt the
+above command accordingly.</p>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="set-the-directory-permissions">
+<h2>Set the Directory Permissions<a class="headerlink" href="#set-the-directory-permissions" title="Permalink to this headline">¶</a></h2>
+<p>The user running your web server must own at least the apps/, data/ and config/
+directories in your ownCloud installation folder.
+The following command will change the ownership of the whole folder to that user.</p>
+<ul>
+<li><p class="first">For Debian-based distributions (like Ubuntu, Debian or Linux Mint) and Gentoo, run:</p>
+<div class="highlight-python"><pre>sudo chown -R www-data:www-data /path/to/your/owncloud</pre>
+</div>
+</li>
+<li><p class="first">Continuing the example from above, for Ubuntu 12.04 LTS, where the install location
+was <tt class="code docutils literal"><span class="pre">/var/www</span></tt>, you would run:</p>
+<div class="highlight-python"><pre>sudo chown -R www-data:www-data /var/www/owncloud</pre>
+</div>
+</li>
+<li><p class="first">For ArchLinux should run (as root):</p>
+<div class="highlight-python"><pre>chown -R http:http /path/to/your/owncloud</pre>
+</div>
+</li>
+<li><p class="first">Fedora users should run (as root):</p>
+<div class="highlight-python"><pre>chown -R apache:apache /path/to/your/owncloud</pre>
+</div>
+</li>
+</ul>
+<p>When using an NFS mount for the data directory, do not change ownership as above.
+The simple act of mounting the drive will set proper permissions for ownCloud to
+write to the directory. Changing ownership as above could result in some issues
+if the NFS mount is lost.</p>
+</div>
+<div class="section" id="web-server-configuration">
+<h2>Web Server Configuration<a class="headerlink" href="#web-server-configuration" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can use ownCloud over plain http, but we strongly encourage you to
+use SSL/TLS. If you don’t use it, and you for example access your
+ownCloud over an unsecured WiFi, everyone in the same WiFi can grab
+your authentication data or the content of files synchronized while you
+are on the WiFi.</p>
+</div>
+<p>Apache is the recommended web server.</p>
+<div class="section" id="apache-configuration">
+<h3>Apache Configuration<a class="headerlink" href="#apache-configuration" title="Permalink to this headline">¶</a></h3>
+<div class="section" id="enabling-ssl">
+<h4>Enabling SSL<a class="headerlink" href="#enabling-ssl" title="Permalink to this headline">¶</a></h4>
+<p>An Apache installed under Ubuntu comes already set-up with a simple
+self-signed certificate. All you have to do is to enable the ssl module and
+the according site. Open a terminal and run</p>
+<div class="highlight-python"><pre>sudo a2enmod ssl
+sudo a2ensite default-ssl
+sudo service apache2 reload</pre>
+</div>
+<p>If you are using a different distribution, check their documentation on how to
+enable SSL.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Self-signed certificates have their drawbacks - especially when you
+plan to make your ownCloud server publicly accessible. You might want
+to consider getting a certificate signed by an official signing
+authority. If you’re looking for a free certificate, you can consult
+e.g. this article:
+<cite>https://www.sslshopper.com/article-free-ssl-certificates-from-a-free-certificate-authority.html</cite></p>
+</div>
+</div>
+<div class="section" id="configuring-owncloud">
+<h4>Configuring ownCloud<a class="headerlink" href="#configuring-owncloud" title="Permalink to this headline">¶</a></h4>
+<p>Since there was a change in the way versions 2.2 and 2.4 are configured,
+you’ll have to find out which Apache version you are using.</p>
+<p>Usually you can do this by running one of the following commands:</p>
+<div class="highlight-python"><pre>sudo apachectl -v
+apache2 -v</pre>
+</div>
+<p>Example output:</p>
+<div class="highlight-python"><pre>Server version: Apache/2.2.22 (Ubuntu)
+Server built: Jul 12 2013 13:37:10</pre>
+</div>
+<p>This indicates an Apache of the 2.2 version branch (as e.g. you will find on
+Ubuntu 12.04 LTS).</p>
+<p>Example config for Apache 2.2:</p>
+<div class="highlight-xml"><pre><Directory /path/to/your/owncloud/install>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Order allow,deny
+ allow from all
+</Directory></pre>
+</div>
+<p>Example config for Apache 2.4:</p>
+<div class="highlight-xml"><pre><Directory /path/to/your/owncloud/install>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride All
+ Require all granted
+</Directory></pre>
+</div>
+<ul>
+<li><p class="first">This config entry needs to go into the configuration file of the “site” you want
+to use.</p>
+</li>
+<li><p class="first">On a Ubuntu system, this typically is the “default-ssl” site (to be found at
+<tt class="code docutils literal"><span class="pre">/etc/apache2/sites-available/default-ssl</span></tt>).</p>
+</li>
+<li><p class="first">Edit the site file with your favorite editor (note that you’ll need root
+permissions to modify that file). For Ubuntu 12.04 LTS, you could for example run
+the following command in a Terminal:</p>
+<div class="highlight-python"><pre>sudo nano /etc/apache2/sites-available/default-ssl</pre>
+</div>
+</li>
+<li><p class="first">Add the entry shown above immediately before the line containing</p>
+<div class="highlight-python"><pre></VirtualHost></pre>
+</div>
+<p>(this should be one of the last lines in the file).</p>
+</li>
+<li><p class="first">For ownCloud to work correctly, we need the module mod_rewrite. Enable it by running:</p>
+<div class="highlight-python"><pre>sudo a2enmod rewrite</pre>
+</div>
+</li>
+<li><p class="first">In distributions that do not come with a2enmod the module needs to be enabled
+manually by editing the config Apache files, usually <tt class="file docutils literal"><span class="pre">/etc/httpd/httpd.conf</span></tt>.
+consult the Apache documentation or your distributions documentation.</p>
+</li>
+<li><p class="first">Then restart Apache.</p>
+<ul>
+<li><p class="first">For Ubuntu systems (or distributions using upstartd), run:</p>
+<div class="highlight-python"><pre>sudo service apache2 restart</pre>
+</div>
+</li>
+<li><p class="first">For systemd systems (Fedora, ArchLinux, OpenSUSE), run:</p>
+<div class="highlight-python"><pre>systemctl restart httpd.service</pre>
+</div>
+</li>
+</ul>
+</li>
+<li><p class="first">In order for the maximum upload size to be configurable, the .htaccess file in the
+ownCloud folder needs to be made writable by the server (this should already be done,
+see section <a class="reference internal" href="#set-the-directory-permissions">Set the Directory Permissions</a>).</p>
+</li>
+<li><p class="first">You should make sure that any built-in WebDAV module of your web server is disabled
+(at least for the ownCloud directory), as it will interfere with ownCloud’s
+built-in WebDAV support.</p>
+<p>If you need the WebDAV support in the rest of your configuration, you can turn it off
+specifically for the ownCloud entry by adding the following line in the
+configuration of your ownCloud. In above “<Directory ...” code, add the following line
+directly after the “allow from all” / “Require all granted” line):</p>
+<div class="highlight-python"><pre>Dav Off</pre>
+</div>
+</li>
+<li><p class="first">Furthermore, you need to disable any server-configured authentication for ownCloud, as
+it’s internally using Basic authentication for its *DAV services.
+If you have turned on authentication on a parent folder (via e.g. an “AuthType Basic”
+directive), you can turn off the authentication specifically for the ownCloud entry;
+to do so, in above “<Directory ...” code, add the following line directly after the
+“allow from all” / “Require all granted” line):</p>
+<div class="highlight-python"><pre>Satisfy Any</pre>
+</div>
+</li>
+</ul>
+<p>A minimal site configuration on Ubuntu 12.04 might look like this:</p>
++<div class="highlight-xml"><pre><IfModule mod_ssl.c>
++<VirtualHost _default_:443>
++ ServerName YourServerName
++ ServerAdmin webmaster at localhost
++ DocumentRoot /var/www
++ <Directory />
++ Options FollowSymLinks
++ AllowOverride None
++ </Directory>
++ <Directory /var/www/>
++ Options Indexes FollowSymLinks MultiViews
++ AllowOverride None
++ Order allow,deny
++ allow from all
++ </Directory>
++ ErrorLog ${APACHE_LOG_DIR}/error.log
++ LogLevel warn
++ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
++ SSLEngine on
++ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
++ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
++ <FilesMatch "\.(cgi|shtml|phtml|php)$">
++ SSLOptions +StdEnvVars
++ </FilesMatch>
++ <Directory /usr/lib/cgi-bin>
++ SSLOptions +StdEnvVars
++ </Directory>
++ BrowserMatch "MSIE [2-6]" \
++ nokeepalive ssl-unclean-shutdown \
++ downgrade-1.0 force-response-1.0
++ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
++ <Directory /var/www/owncloud>
++ Options Indexes FollowSymLinks MultiViews
++ AllowOverride All
++ Order allow,deny
++ Allow from all
++ # add any possibly required additional directives here
++ # e.g. the Satisfy directive:
++ Satisfy Any
++ </Directory>
++</VirtualHost>
++</IfModule></pre>
++</div>
+<p>When using ssl, take special note on the ServerName. You should specify one in the
+server configuration, as well as in the CommonName field of the certificate. If you want
+your ownCloud to be reachable via the internet, then set both these to the domain you
+want to reach your ownCloud under.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">By default, the certificates’ CommonName will get set to the host name at the time
+when the ssl-cert package was installed.</p>
+</div>
+</div>
+</div>
+<div class="section" id="nginx-configuration">
+<h3>Nginx Configuration<a class="headerlink" href="#nginx-configuration" title="Permalink to this headline">¶</a></h3>
+<ul class="simple">
+<li>You need to insert the following code into <strong>your nginx config file.</strong></li>
+<li>Adjust <strong>server_name</strong>, <strong>root</strong>, <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong> to suit your needs.</li>
+<li>Make sure your SSL certificates are readable by the server (see <a class="reference external" href="http://wiki.nginx.org/HttpSslModule">http://wiki.nginx.org/HttpSslModule</a>).</li>
+</ul>
+<div class="highlight-python"><pre>upstream php-handler {
+ server 127.0.0.1:9000;
+ #server unix:/var/run/php5-fpm.sock;
+}
+
+server {
+ listen 80;
+ server_name cloud.example.com;
+ return 301 https://$server_name$request_uri; # enforce https
+}
+
+server {
+ listen 443 ssl;
+ server_name cloud.example.com;
+
+ ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+ ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ # Path to the root of your installation
+ root /var/www/;
+
+ client_max_body_size 10G; # set max upload size
+ fastcgi_buffers 64 4K;
+
+ rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect;
+ rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect;
+ rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect;
+
+ index index.php;
+ error_page 403 /core/templates/403.php;
+ error_page 404 /core/templates/404.php;
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+ location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
+ deny all;
+ }
+
+ location / {
+ # The following 2 rules are only needed with webfinger
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+
+ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
+ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
+
+ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
+ try_files $uri $uri/ index.php;
+ }
+
+ location ~ ^(.+?\.php)(/.*)?$ {
+ try_files $1 = 404;
+
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$1;
+ fastcgi_param PATH_INFO $2;
+ fastcgi_param HTTPS on;
+ fastcgi_pass php-handler;
+ }
+
+ # Optional: set long EXPIRES header on static assets
+ location ~* ^.+\.(jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
+ expires 30d;
+ # Optional: Don't log access to assets
+ access_log off;
+ }
+
+}</pre>
+</div>
+<p>To enable SSL support:
+- Remove the server block containing the redirect
+- Change <strong>listen 443 ssl</strong> to <strong>listen 80;</strong>
+- Remove <strong>ssl_certificate</strong> and <strong>ssl_certificate_key</strong>.
+- Remove <strong>fastcgi_params HTTPS on;</strong></p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you want to effectively increase maximum upload size you will also
+have to modify your <strong>php-fpm configuration</strong> (<strong>usually at
+/etc/php5/fpm/php.ini</strong>) and increase <strong>upload_max_filesize</strong> and
+<strong>post_max_size</strong> values. You’ll need to restart php5-fpm and nginx
+services in order these changes to be applied.</p>
+</div>
+</div>
+<div class="section" id="lighttpd-configuration">
+<h3>Lighttpd Configuration<a class="headerlink" href="#lighttpd-configuration" title="Permalink to this headline">¶</a></h3>
+<p>This assumes that you are familiar with installing PHP application on
+lighttpd.</p>
+<p>It is important to note that the <strong>.htaccess</strong> files used by ownCloud to protect the <strong>data</strong> folder are ignored by
+lighttpd, so you have to secure it by yourself, otherwise your <strong>owncloud.db</strong> database and user data are publicly
+readable even if directory listing is off. You need to add two snippets to your lighttpd configuration file:</p>
+<p>Disable access to data folder:</p>
+<div class="highlight-python"><pre>$HTTP["url"] =~ "^/owncloud/data/" {
+ url.access-deny = ("")
+ }</pre>
+</div>
+<p>Disable directory listing:</p>
+<div class="highlight-python"><pre>$HTTP["url"] =~ "^/owncloud($|/)" {
+ dir-listing.activate = "disable"
+ }</pre>
+</div>
+</div>
+<div class="section" id="yaws-configuration">
+<h3>Yaws Configuration<a class="headerlink" href="#yaws-configuration" title="Permalink to this headline">¶</a></h3>
+<p>This should be in your <strong>yaws_server.conf</strong>. In the configuration file, the
+<strong>dir_listings = false</strong> is important and also the redirect from <strong>/data</strong>
+to somewhere else, because files will be saved in this directory and it
+should not be accessible from the outside. A configuration file would look
+like this</p>
+<div class="highlight-xml"><pre><server owncloud.myserver.com/>
+ port = 80
+ listen = 0.0.0.0
+ docroot = /var/www/owncloud/src
+ allowed_scripts = php
+ php_handler = <cgi, /usr/local/bin/php-cgi>
+ errormod_404 = yaws_404_to_index_php
+ access_log = false
+ dir_listings = false
+ <redirect>
+ /data == /
+ </redirect>
+</server></pre>
+</div>
+<p>The Apache <strong>.htaccess</strong> file that comes with ownCloud is configured to
+redirect requests to nonexistent pages. To emulate that behaviour, you
+need a custom error handler for yaws. See this <a class="reference external" href="https://gist.github.com/2200407">github gist for further instructions</a> on how to create and compile that error handler.</p>
+</div>
+<div class="section" id="hiawatha-configuration">
+<h3>Hiawatha Configuration<a class="headerlink" href="#hiawatha-configuration" title="Permalink to this headline">¶</a></h3>
+<p>Add <strong>WebDAVapp = yes</strong> to the ownCloud virtual host. Users accessing
+WebDAV from MacOS will also need to add <strong>AllowDotFiles = yes</strong>.</p>
+<p>Disable access to data folder:</p>
+<div class="highlight-python"><pre>UrlToolkit {
+ ToolkitID = denyData
+ Match ^/data DenyAccess
+}</pre>
+</div>
+</div>
+<div class="section" id="microsoft-internet-information-server-iis">
+<h3>Microsoft Internet Information Server (IIS)<a class="headerlink" href="#microsoft-internet-information-server-iis" title="Permalink to this headline">¶</a></h3>
+<p>See <a class="reference internal" href="installation_windows.html"><em>Windows 7 and Windows Server 2008</em></a> for further instructions.</p>
+</div>
+</div>
+<div class="section" id="follow-the-install-wizard">
+<h2>Follow the Install Wizard<a class="headerlink" href="#follow-the-install-wizard" title="Permalink to this headline">¶</a></h2>
+<p>Open your web browser and navigate to your ownCloud instance. If you are
+installing ownCloud on the same machine as you will access the install wizard
+from, the url will be: <a class="reference external" href="http://localhost/">http://localhost/</a> (or <a class="reference external" href="http://localhost/owncloud">http://localhost/owncloud</a>).</p>
+<p>For basic installs we recommend SQLite as it is easy to setup (ownCloud will do it for you). For larger installs you
+should use MySQL or PostgreSQL. Click on the Advanced options to show the configuration options. You may enter admin
+credentials and let ownCloud create its own database user, or enter a preconfigured user. If you are not using Apache
+as the web server, please set the data directory to a location outside of the document root. See the advanced
+install settings.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_ucs.html
index b16672e,0000000..ad88098
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_ucs.html
+++ b/core/doc/admin/installation/installation_ucs.html
@@@ -1,409 -1,0 +1,409 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Univention Corporate Server — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Manual Installation" href="installation_source.html" />
+ <link rel="prev" title="Windows 7 and Windows Server 2008" href="installation_windows.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_windows.html">Windows 7 and Windows Server 2008</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Univention Corporate Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#pre-configuration">Pre configuration</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#installation">Installation</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#postconfiguration-optional">Postconfiguration (optional)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#using-owncloud">Using ownCloud</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="univention-corporate-server">
+<h1>Univention Corporate Server<a class="headerlink" href="#univention-corporate-server" title="Permalink to this headline">¶</a></h1>
+<p>Subscribers to the ownCloud Enterprise edition can also integrate with
+<abbr title="Univention Corporate Server">UCS</abbr>.</p>
+<div class="section" id="pre-configuration">
+<span id="preconfig"></span><h2>Pre configuration<a class="headerlink" href="#pre-configuration" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud makes use of the UCR, the Univention Configuration Registry. The values
+are being read during installation, most of them can be changed later, too.
+Changes done directly via ownCloud are not taken over to UCR. We think we found
+sane defaults, nevertheless you might have your own requirements. The
+installation script will listen to the UCR keys listed below. In case you want
+to override any default setting, simply add the key in question to the UCR and
+assign your required value.</p>
+<table border="1" class="longtable docutils">
+<colgroup>
+<col width="20%" />
+<col width="30%" />
+<col width="30%" />
+<col width="20%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Key</th>
+<th class="head">Default</th>
+<th class="head">Description</th>
+<th class="head">Introduced</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>owncloud/directory/data</td>
+<td>/var/lib/owncloud</td>
+<td>Specifies where the file storage will be placed</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/db/name</td>
+<td>owncloud</td>
+<td>Name of the MySQL database. ownCloud will create an own user for it.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-even"><td>owncloud/user/quota</td>
+<td>(empty)</td>
+<td>The default quota, when a user is being added. Assign values in human readable strings, e.g. “2 GB”. Unlimited if empty.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/user/enabled</td>
+<td>0</td>
+<td>Wether a new user is allowed to use ownCloud by default.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-even"><td>owncloud/group/enabled</td>
+<td>0</td>
+<td>Wether a new group is allowed to be used in ownCloud by default.</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/base/users</td>
+<td>cn=users,$ldap_base</td>
+<td>The users-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/base/groups</td>
+<td>cn=groups,$ldap_base</td>
+<td>The groups-subtree in the LDAP directory. If left blank it will fall back to the LDAP base.</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/groupMemberAssoc</td>
+<td>uniqueMember</td>
+<td>The LDAP attribute showing the group-member relationship. Possible values: uniqueMember, memberUid and member</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/tls</td>
+<td>1</td>
+<td>Whether to talk to the LDAP server via TLS.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/disableMainServer</td>
+<td>0</td>
+<td>Deactivates the (first) LDAP Configuration</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/cacheTTL</td>
+<td>600</td>
+<td>Lifetime of the ownCloud LDAP Cache in seconds</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/UUIDAttribute</td>
+<td>(empty)</td>
+<td>Attribute that provides a unique value for each user and group entry. Empty value for autodetection.</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/loginFilter</td>
+<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(uid=*$)) (&(uid=%uid) (ownCloudEnabled=1)))</td>
+<td>The LDAP filter that shall be used when a user tries to log in.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/userlistFilter</td>
+<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0))(!(uid=*$)) (&(ownCloudEnabled=1)))</td>
+<td>The LDAP filter that shall be used when the user list is being retrieved (e.g. for sharing)</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/groupFilter</td>
+<td>(&(objectClass=posixGroup) (ownCloudEnabled=1))</td>
+<td>The LDAP filter that shall be used when the group list is being retrieved (e.g. for sharing)</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/internalNameAttribute</td>
+<td>uid</td>
+<td>Attribute that should be used to create the user’s owncloud internal name</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/displayName</td>
+<td>uid</td>
+<td>The LDAP attribute that should be displayed as name in ownCloud</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/user/searchAttributes</td>
+<td>uid,givenName,sn,description,employeeNumber,mailPrimaryAddress</td>
+<td>Attributes taken into consideration when searching for users (comma separated)</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/user/quotaAttribute</td>
+<td>ownCloudQuota</td>
+<td>Name of the quota attribute. The default attribute is provided by owncloud-schema.</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/user/homeAttribute</td>
+<td>(empty)</td>
+<td>Attribute that should be used to create the user’s owncloud internal home folder</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/ldap/group/displayName</td>
+<td>cn</td>
+<td>The LDAP attribute that should be used as groupname in ownCloud</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-odd"><td>owncloud/ldap/group/searchAttributes</td>
+<td>cn,description, mailPrimaryAddress</td>
+<td>Attributes taken into consideration when searching for groups (comma separated)</td>
+<td>5.0.9</td>
+</tr>
+<tr class="row-even"><td>owncloud/join/users/update</td>
+<td>yes</td>
+<td>Wether ownCloud LDAP schema should be applied to existing users</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/group/enableDomainUsers</td>
+<td>1</td>
+<td>Wether the group “Domain Users” shall be enabled for ownCloud on install</td>
+<td>2012.4.0.4</td>
+</tr>
+<tr class="row-even"><td>owncloud/join/users/filter</td>
+<td>(&(|(&(objectClass=posixAccount) (objectClass=shadowAccount)) (objectClass=univentionMail) (objectClass=sambaSamAccount) (objectClass=simpleSecurityObject) (&(objectClass=person) (objectClass=organizationalPerson) (objectClass=inetOrgPerson))) (!(uidNumber=0)) (!(|(uid=*$) (uid=owncloudsystemuser) (uid=join-backup) (uid=join-slave))) (!(objectClass=ownCloudUser)))</td>
+<td>Filters, on which LDAP users the ownCloud schema should be applied to. The default excludes system users and already ownCloudUsers.</td>
+<td>2012.0.1</td>
+</tr>
+<tr class="row-odd"><td>owncloud/join/groups/filter</td>
+<td>(empty)</td>
+<td>Filters which LDAP groups will be en/disabled for ownCloud when running the script /usr/share/owncloud/update-groups.sh</td>
+<td>2012.4.0.4</td>
+</tr>
+</tbody>
+</table>
+<p>If you want to override the default settings, simply create the key in
+question in the UCR and assign your required value, for example:</p>
+<div class="highlight-python"><pre>ucr set owncloud/user/enabled=1</pre>
+</div>
+<p>or via UMC:</p>
+<img alt="../_images/ucsint2.png" src="../_images/ucsint2.png" />
+</div>
+<div class="section" id="installation">
+<h2>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
+<p>Now, we are ready to install ownCloud. This can be either done through the UCS
+App Center (recommended) or by downloading the packages.</p>
+<div class="section" id="ucs-app-center">
+<h3>UCS App Center<a class="headerlink" href="#ucs-app-center" title="Permalink to this headline">¶</a></h3>
+<p>Open the Univention Management Console and choose the App Center module. You
+will see a variety of available applications, including ownCloud.</p>
+<img alt="../_images/ucs-app-center-module.png" src="../_images/ucs-app-center-module.png" />
+<p>Click on ownCloud 5 and follow the instructions.</p>
+<img alt="../_images/ucs-app-center-install.png" src="../_images/ucs-app-center-install.png" />
+<p>In the UCS App Center, you can also upgrade from ownCloud 4.5 by installing
+ownCloud 5.0. They are provided as separate apps. It is only possible to have
+one version of ownCloud installed.</p>
+</div>
+<div class="section" id="manually-by-download">
+<h3>Manually by download<a class="headerlink" href="#manually-by-download" title="Permalink to this headline">¶</a></h3>
+<p>Download the integration packages <a class="reference external" href="https://owncloud.com/download">from our website</a> and install them from
+within your download folder (note: the package owncloud-unsupported is
+optional) via command line:</p>
+<div class="highlight-python"><pre>dpkg -i owncloud*.deb</pre>
+</div>
+<p>ownCloud will be configured to fully work with LDAP.</p>
+</div>
+<div class="section" id="reinstallation">
+<h3>Reinstallation<a class="headerlink" href="#reinstallation" title="Permalink to this headline">¶</a></h3>
+<p>When ownCloud was installed before and uninstalled via AppCenter or via command
+line using apt-get remove, ownCloud can be simply installed again. The old
+configuration will be used again.</p>
+<p>When an older ownCloud was installed and has been purged (only possible via
+command line using apt-get purge) the old configuration is gone, but data is
+left. This blocks an installation. You can either install the old version and
+upgrade to ownCloud 5 or (re)move the old data. This is done by removing the
+MySQL database “ownCloud” using the command line:</p>
+<div class="highlight-python"><pre>mysql -u root -e "DROP DATABASE owncloud" -p`tail /etc/mysql.secret</pre>
+</div>
+<p>In this case you probably also want to remove the data directory
+<strong>/var/lib/owncloud</strong> although this is not mandatory.</p>
+</div>
+</div>
+<div class="section" id="postconfiguration-optional">
+<h2>Postconfiguration (optional)<a class="headerlink" href="#postconfiguration-optional" title="Permalink to this headline">¶</a></h2>
+<p>There is only one local admin user “owncloudadmin”, you can find his password in
+<cite>/etc/owncloudadmin.secret</cite>. Use this account, if you want to change basic
+ownCloud settings.</p>
+<p>In the installation process a virtual host is set up (Apache is required
+therefore). If you want to modify the settings, edit
+<tt class="file docutils literal"><span class="pre">/etc/apache2/sites-available/owncloud</span></tt> and restart the web server. You
+might want to do it to enable HTTPS connections. Besides that, you can edit the
+<strong>.htaccess-File in /var/www/owncloud/</strong>. In the latter file there are also the
+PHP limits for file transfer specified.</p>
+</div>
+<div class="section" id="using-owncloud">
+<h2>Using ownCloud<a class="headerlink" href="#using-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>If you decided to enable every user by default to use ownCloud, simply
+open up <a class="reference external" href="http://myserver.com/owncloud/">http://myserver.com/owncloud/</a> and log in with your LDAP
+credentials and enjoy.</p>
+<p>If you did not, go to the UMC and enable the users who shall have access
+(see picture below). Then, login at <a class="reference external" href="http://myserver.com/owncloud/">http://myserver.com/owncloud/</a> with
+your LDAP credentials.</p>
+<img alt="../_images/ucsint1.png" src="../_images/ucsint1.png" />
+<p>Updating users can also be done by the script
+<tt class="file docutils literal"><span class="pre">/usr/share/owncloud/update-users.sh</span></tt> . It takes the following UCR
+variables as parameters: <strong>owncloud/user/enabled</strong> for enabling or disabling,
+<strong>owncloud/user/quota</strong> as the Quota value and <strong>owncloud/join/users/filter</strong> as
+LDAP filter to select the users to update.</p>
+<div class="section" id="groups-2012-4-0-4">
+<h3>Groups 2012.4.0.4<a class="headerlink" href="#groups-2012-4-0-4" title="Permalink to this headline">¶</a></h3>
+<p>Since ownCloud Enterprise 2012.4.0.4 group support is enabled. Groups,
+that are activated for ownCloud usage, can be used to share files to
+instead of single users, for example. It is also important to note, that
+users can only share within groups where they belong to. Groups can be
+enabled and disabled via UCM as shown in the screen shot below.</p>
+<img alt="../_images/ucsint.png" src="../_images/ucsint.png" />
+<p>Another way to enable or disable groups is to use the script
+<tt class="file docutils literal"><span class="pre">/usr/share/owncloud/update-groups.sh</span></tt>. Currently, it takes an argument
+which can be 1=enable groups or 0=disable groups. The filter applied is being
+taken from the UCR variable <strong>owncloud/join/groups/filter</strong>. In case it is
+empty, a message will be displayed.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/installation/installation_windows.html
index 251258b,0000000..27c0efe
mode 100644,000000..100644
--- a/core/doc/admin/installation/installation_windows.html
+++ b/core/doc/admin/installation/installation_windows.html
@@@ -1,427 -1,0 +1,427 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Windows 7 and Windows Server 2008 — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Installation" href="index.html" />
+ <link rel="next" title="Univention Corporate Server" href="installation_ucs.html" />
+ <link rel="prev" title="Mac OS X" href="installation_macos.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Installation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation_appliance.html">Appliances</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_linux.html">Linux Distributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_macos.html">Mac OS X</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Windows 7 and Windows Server 2008</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#activate-iis-with-cgi-support">Activate IIS with CGI Support</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#installing-php">Installing PHP</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#installing-mysql">Installing MySQL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#installing-owncloud">Installing ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#ensure-proper-http-verb-handling">Ensure Proper HTTP-Verb handling</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#configuring-owncloud-php-and-iis-for-large-file-uploads">Configuring ownCloud, PHP and IIS for Large File Uploads</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="installation_ucs.html">Univention Corporate Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_source.html">Manual Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html">PageKite Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation_others.html#open-wrt">Open Wrt</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="windows-7-and-windows-server-2008">
+<h1>Windows 7 and Windows Server 2008<a class="headerlink" href="#windows-7-and-windows-server-2008" title="Permalink to this headline">¶</a></h1>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You must move the data directory outside of your public root (See
+advanced install settings)</p>
+</div>
+<p>This section describes how to install ownCloud on Windows with <abbr title="Internet Information Services">IIS</abbr>.</p>
+<p>It assumes that you have a vanilla, non-IIS enabled Windows
+machine – Windows 7 or Server 2008. After enabling IIS, the steps are
+essentially identical for Windows 7 and Windows Server 2008.</p>
+<p>For installing ownCloud physical access or a remote desktop connection is
+required. You should leverage MySQL as the backend database for ownCloud. If you
+do not want to use MySQL, it is possible to use Postgres or SQLite instead.
+Microsoft SQL Server is not yet support.</p>
+<p>Enabling SSL is not yet covered by this section.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you make your desktop machine or server available outside of your
+LAN, you must maintain it. Monitor the logs, manage the access, apply patches to
+avoid compromising the system at large.</p>
+</div>
+<p>There are 4 primary steps to the installation, and then a 5th step
+required for configuring everything to allow files larger than the
+default 2MB.</p>
+<ol class="arabic simple">
+<li>Install IIS with CGI support – enable IIS on your Windows machine.</li>
+<li>Install PHP – Grab, download and install PHP.</li>
+<li>Install MySQL – Setup the MySQL server manager and enable ownCloud to create
+an instance.</li>
+<li>Install ownCloud – The whole reason we are here!</li>
+<li>Configure upload sizes and timeouts to enable large file uploads – So that
+you can upload larger files.</li>
+</ol>
+<div class="section" id="activate-iis-with-cgi-support">
+<h2>Activate IIS with CGI Support<a class="headerlink" href="#activate-iis-with-cgi-support" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="windows-7">
+<h3>Windows 7<a class="headerlink" href="#windows-7" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>Go to <em class="guilabel">Start –> Control Panel –> Programs</em>.</li>
+<li>Under Programs and Features, there is link titled <em class="guilabel">Turn Windows Features on
+and Off</em>. Click on it.</li>
+<li>There is a box labeled Internet Information Services, expand it.</li>
+<li>Expand World Wide Web Services and all the folders underneath.</li>
+<li>Select the folders as illustrated in the picture below to get your IIS
+server up and running.</li>
+</ol>
+<div class="align-center figure align-center">
+<img alt="Windows features required for ownCloud on Windows 7" src="../_images/win7features.jpg" style="width: 250px;" />
+<p class="caption">Windows Features required for ownCloud on Windows 7</p>
+</div>
+<p>You do not need an FTP server running, so you should tune
+that feature off for your server. You definitely need the IIS Management
+Console, as that is the easiest way to start, stop, restart you server,
+as well as where you change certificate options and manage items like
+file upload size. You must check the CGI box under Application
+Development Features, because CGI is how you enable PHP on IIS.</p>
+<p>You have to turn off WebDAV publishing or the Windows WebDAV
+conflicts with the ownCloud WebDAV interface. This might already be
+turned off for you, just make sure it stays that way. The common HTTP
+features are the features you would expect from a web server.
+With the selections on this page, IIS will now serve up a web page for you.</p>
+<p>Restart IIS by going to the IIS manager (<em class="guilabel">Start –> IIS Manager</em>).</p>
+<p>Select your website, and on the far right side is a section titled
+<em class="guilabel">Manage Server</em>. Make sure that the service is started, or click
+<em class="guilabel">Start</em> to start the services selected. Once this is complete, you
+should be able to go to a web browser and navigate to <a class="reference external" href="http://localhost">http://localhost</a>.</p>
+<p>This should open the standard IIS 7 splash page, which is just a static image
+that says your web server is running. Assuming you were able to get the
+splash page, it is safe to say your web server is now up and running.</p>
+</div>
+<div class="section" id="windows-server-2008">
+<h3>Windows Server 2008<a class="headerlink" href="#windows-server-2008" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>Go to <em class="guilabel">Start –> Control Panel –> Programs</em>.</li>
+<li>Under Programs and Features, there is link titled
+<em class="guilabel">Turn Windows Features on and Off</em>. Click on it.</li>
+<li>This will bring up the Server Manager.</li>
+<li>In the server manager, Click on Roles, and then click Add Roles.</li>
+<li>Use the <em class="guilabel">Add Roles Wizard</em> to add the web server role.</li>
+</ol>
+<div class="align-center figure align-center">
+<img alt="server roles required for ownCloud" src="../_images/winserverroles.jpg" style="width: 300px;" />
+<p class="caption">Server roles required for ownCloud</p>
+</div>
+<ol class="arabic simple" start="6">
+<li>Make sure that, at a minimum, the same boxes are checked in this wizard that
+are checked in the Windows 7 Section. For example, make sure that the CGI box
+is checked under Application Development Features, and that WebDAV Publishing
+is turned off. With Remote Desktop Sharing turned on, the detailed role
+service list looks like the figure “Role Services”.</li>
+<li>Restart IIS by going to the IIS manager (<em class="guilabel">Start –> IIS Manager</em>).</li>
+<li>Select your website, and on the far right side is a section titled Manage
+server. Make sure that the service is started, or click “Start” to start the
+services selected.</li>
+<li>Once this is complete, you should be able to go to a web browser and type
+<cite>localhost</cite>. This should open the standard IIS 7 splash page, which is just a
+static image that says your web server is running.Assuming you were able to get
+the splash page, it is safe to say your web server is now up and running. The
+next part of this “how to” installs PHP on the server.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="installing-php">
+<h2>Installing PHP<a class="headerlink" href="#installing-php" title="Permalink to this headline">¶</a></h2>
+<p>This part is also straightforward, but it is necessary to remind you that this
+is for IIS only.</p>
+<ol class="arabic simple">
+<li>Go to the following link and grab the <a class="reference external" href="http://windows.php.net/download/">PHP installer</a> for version “VC9 Non Thread Safe” 32 or
+64 bit based on your system.</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are using Apache, make sure you grab VC6 instead, lower on the page.</p>
+</div>
+<ol class="arabic simple" start="2">
+<li>Once through that login, select the location that is closest to you
+geographically.</li>
+<li>Run that install wizard once it is downloaded. Read the license agreement,
+agree, select an install directory.</li>
+<li>Then select IIS FastCGI as the install server.</li>
+<li>Take the default selections for the items to install, and click next.
+Then click <cite>install</cite>.</li>
+<li>After a few minutes, PHP will be installed. On to MySQL.</li>
+</ol>
+</div>
+<div class="section" id="installing-mysql">
+<h2>Installing MySQL<a class="headerlink" href="#installing-mysql" title="Permalink to this headline">¶</a></h2>
+<p>This part installs MySQL on your Windows machine.</p>
+<ol class="arabic simple">
+<li>Point your browser to <a class="reference external" href="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</a> and download the latest
+community edition for your OS – the 32 or 64 bit version. Please download the
+<strong>MSI Installer</strong> as it will make life easier.</li>
+<li>Once downloaded, install MySQL (5.5 at the time of writing). Select the
+Typical installation.</li>
+<li>When that finishes, check the box to launch the MySQL Instance Configuration
+Wizard and click Finish.</li>
+<li>Select a standard configuration, as this will be the only version of MySQL on
+this machine.</li>
+<li>Select to install as a windows service, and Check the Launch the MySQL Server
+Automatically button.</li>
+<li>Select the modify security settings box on the next page, and enter a
+password you will remember. You will need this password when you configure
+ownCloud.</li>
+<li>Uncheck <strong>enable</strong> root access from remote machines” for security reasons.</li>
+<li>Click execute, and wait while the instance is created and launched.</li>
+<li>Click Finish when this is all complete.</li>
+</ol>
+<p>Take particular note of your MySQL password, as the user name <strong>root</strong>
+and the password you select will be necessary later on in the ownCloud
+installation. As an aside, this link is an excellent resource for questions on
+how to configure your MySQL instance, and also to configure PHP to work with
+MySQL. This, however, is not strictly necessary as much of this is handled when
+you download ownCloud.</p>
+<p>More information in this topic can be found in a <a class="reference external" href="http://learn.iis.net/page.aspx/353/install-and-configure-mysql-for-php-applications-on-iis-7-and-above/">tutorial on the IIS web site</a>.</p>
+</div>
+<div class="section" id="installing-owncloud">
+<h2>Installing ownCloud<a class="headerlink" href="#installing-owncloud" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Download the latest version of ownCloud from <a class="reference external" href="http://owncloud.org/download">http://owncloud.org/download</a>.</li>
+<li>It will arrive as a tar.bz2 file, and I recommend something like jZip for a
+free utility to unzip it.</li>
+<li>Once you have the ownCloud directory unzipped and saved locally, copy it into
+your wwwroot directory (probably <strong>C:\inetpub\wwwroot</strong>).</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You cannot install directly into the directory <strong>wwwroot</strong> from jzip,
+as only the administrator can unzip into the <strong>wwwroot</strong> directory. If you save
+it in a different folder, and then move the files into <strong>wwwroot</strong> in windows
+explorer, it works. This will install ownCloud locally in your root web
+directory. You can use a subdirectory called owncloud, or whatever you want –
+the www root, or something else.</p>
+</div>
+<ol class="arabic simple" start="4">
+<li>It is now time to give write access to the ownCloud directory to the ownCloud
+server: Navigate your windows explorer over to <strong>inetpub/wwwroot/owncloud</strong> (or
+your installation directory if you selected something different).</li>
+<li>Right click and select properties. Click on the security tab, and click the
+button “to change permissions, click edit”.</li>
+<li>Select the “users” user from the list, and check the box “write”.</li>
+<li>Apply these settings and close out.</li>
+<li>Now open your browser and go to <a class="reference external" href="http://localhost/owncloud">http://localhost/owncloud</a> (or localhost if it
+is installed in the root www directory). This should bring up the ownCloud
+configuration page.</li>
+<li>At this page, you enter your desired ownCloud user name and password for the
+administrator, and expand the little arrow.</li>
+<li>Select MySQL as the database, and enter your MySQL database user name,
+password and desired instance name – use the user name and password you setup
+for MySQL earlier in step 3, and pick any name for the database instance.</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The ownCloud admin password and the MySQL password CANNOT be the same
+in any way.</p>
+</div>
+<ol class="arabic simple" start="11">
+<li>Click next, and ownCloud should have you logged in as the admin user, and
+you can get started exploring ownCloud, creating other users and more!</li>
+</ol>
+</div>
+<div class="section" id="ensure-proper-http-verb-handling">
+<h2>Ensure Proper HTTP-Verb handling<a class="headerlink" href="#ensure-proper-http-verb-handling" title="Permalink to this headline">¶</a></h2>
+<p>IIS must pass all HTTP and WebDAV verbs to the PHP/CGI handler, and must not try
+to handle them by itself. If it does, syncing with the Desktop and Mobile
+Clients will fail. Here is how to ensure your configuration is correct:</p>
+<ol class="arabic simple">
+<li>Open IIS Manager7.</li>
+<li>In the <cite>Connections</cite> bar, pick your site below <cite>Sites</cite>, or choose the top
+level entry if you want to modify the machine-wide settings.</li>
+<li>Choose the <cite>Handler Mappings</cite> feature click <cite>PHP_via_fastCGI</cite>.</li>
+<li>Choose <cite>Request Restrictions</cite> and find the <cite>Verbs</cite> tab.</li>
+<li>Ensure <cite>All Verbs</cite> is checked.</li>
+<li>Click <cite>OK</cite>.</li>
+<li>Next, choose <cite>Request Filtering</cite> feature from IIS Manager.</li>
+<li>Ensure that all verbs are permitted (or none are forbidden) in the <cite>Verbs</cite>
+tab.</li>
+</ol>
+<p>Also, ensure that you did not enable the WebDAV authoring module, since ownCloud
+needs to be able to handle WebDAV on the application level.</p>
+</div>
+<div class="section" id="configuring-owncloud-php-and-iis-for-large-file-uploads">
+<h2>Configuring ownCloud, PHP and IIS for Large File Uploads<a class="headerlink" href="#configuring-owncloud-php-and-iis-for-large-file-uploads" title="Permalink to this headline">¶</a></h2>
+<p>Before going too nuts on ownCloud, it is important to do a couple of
+configuration changes to make this a useful service for you. You will probably
+want to increase the <strong>max upload size</strong>, for example. The default upload is
+set to <strong>2MB</strong>, which is too small for even most MP3 files.</p>
+<p>To do that, simply go into your <strong>PHP.ini</strong> file, which can be found in your
+<strong>C:\Program Files (x86)\PHP</strong> folder. In here, you will find a <strong>PHP.ini</strong>
+file. Open this in a text editor, and look for a few key attributes to
+change:</p>
+<ul class="simple">
+<li><strong>upload_max_filesize</strong> – change this to something good, like 1G, and you
+will get to upload much larger files.</li>
+<li><strong>post_max_size</strong> – also change this size, and make it larger than the max
+upload size you chose, like 1G.</li>
+</ul>
+<p>There are other changes you can make, such as the timeout duration for
+uploads, but for now you should be all set in the <strong>PHP.ini</strong> file.</p>
+<p>Now you have to go back to IIS manager and make one last change to enable file
+uploads on the web server larger than 30MB.</p>
+<ol class="arabic">
+<li><p class="first">Go to the start menu, and type <strong>iis manager</strong>.</p>
+</li>
+<li><p class="first">Open IIS Manager Select the website you want enable to accept large file
+uploads.</p>
+</li>
+<li><p class="first">In the main window in the middle double click on the icon <strong>Request
+filtering</strong>.</p>
+</li>
+<li><p class="first">Once the window is opened you will see a bunch of tabs across the top of the
+far right,</p>
+<p>Select <em class="guilabel">Edit Feature Settings</em> and modify the <em class="guilabel">Maximum
+allowed content length (bytes)</em></p>
+</li>
+<li><p class="first">In here, you can change this to up to 4.1 GB.</p>
+</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This entry is in BYTES, not KB.</p>
+</div>
+<p>You should now have ownCloud configured and ready for use.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/issues/index.html
index 340f050,0000000..33a2e9d
mode 100644,000000..100644
--- a/core/doc/admin/issues/index.html
+++ b/core/doc/admin/issues/index.html
@@@ -1,161 -1,0 +1,161 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Issues — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="prev" title="Migrating ownCloud Installations" href="../maintenance/migrating.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="issues">
+<h1>Issues<a class="headerlink" href="#issues" title="Permalink to this headline">¶</a></h1>
+<p>If you think you have found a bug in ownCloud, please:</p>
+<ul class="simple">
+<li>Search for a solution</li>
+<li>Double check your configuration</li>
+</ul>
+<p>If you can’t find a solution, please file an issue:</p>
+<ul class="simple">
+<li>If the issue is with the ownCloud server, report it to the <a class="reference external" href="https://github.com/owncloud/core">GitHub core repository</a></li>
+<li>If the issue is with the ownCloud client, report it to the <a class="reference external" href="https://github.com/owncloud/mirall">GitHub mirall repository</a></li>
+<li>If the issue with with an ownCloud app, report it to where that app is developed<ul>
+<li>If the app is listed <a class="reference external" href="https://github.com/owncloud">here</a> report it to the correct repository</li>
+<li>If the app is listed <a class="reference external" href="https://github.com/owncloud/apps">here</a> report it to the apps repository</li>
+</ul>
+</li>
+</ul>
+<p>Please note that the mailing list should not be used for bug reports, as it is hard to track them there.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/backup.html
index 713a62c,0000000..1c6b748
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/backup.html
+++ b/core/doc/admin/maintenance/backup.html
@@@ -1,189 -1,0 +1,189 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Backing up ownCloud — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Maintenance" href="index.html" />
+ <link rel="next" title="Updating ownCloud" href="update.html" />
+ <link rel="prev" title="Maintenance" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Backing up ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#backup-folders">Backup Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#backup-database">Backup Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="backing-up-owncloud">
+<h1>Backing up ownCloud<a class="headerlink" href="#backing-up-owncloud" title="Permalink to this headline">¶</a></h1>
+<p>To backup an ownCloud installation there are three main things you need to retain:</p>
+<ol class="arabic simple">
+<li>The config folder</li>
+<li>The data folder</li>
+<li>The database</li>
+</ol>
+<div class="section" id="backup-folders">
+<h2>Backup Folders<a class="headerlink" href="#backup-folders" title="Permalink to this headline">¶</a></h2>
+<p>Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
+your ownCloud environment. You could use this command:</p>
+<div class="highlight-python"><pre>rsync -Aax owncloud/ owncloud-dirbkp_`date +"%Y%m%d"`/</pre>
+</div>
+</div>
+<div class="section" id="backup-database">
+<h2>Backup Database<a class="headerlink" href="#backup-database" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="mysql">
+<h3>MySQL<a class="headerlink" href="#mysql" title="Permalink to this headline">¶</a></h3>
+<p>MySQL is the recommended database engine. To backup MySQL:</p>
+<div class="highlight-python"><pre>mysqldump --lock-tables -h [server] -u [username] -p[password] > owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
+</div>
+</div>
+<div class="section" id="sqlite">
+<h3>SQLite<a class="headerlink" href="#sqlite" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>sqlite3 data/owncloud.db .dump > owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
+</div>
+</div>
+<div class="section" id="postgresql">
+<h3>PostgreSQL<a class="headerlink" href="#postgresql" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>PGPASSWORD="password" pg_dump owncloud -h [server] -U [username] -f owncloud-sqlbkp_`date +"%Y%m%d"`.bak</pre>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/index.html
index 7c95ef6,0000000..bbf3838
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/index.html
+++ b/core/doc/admin/maintenance/index.html
@@@ -1,160 -1,0 +1,160 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Maintenance — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="next" title="Backing up ownCloud" href="backup.html" />
+ <link rel="prev" title="Serving static files via web server" href="../configuration/xsendfile.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Maintenance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="maintenance">
+<h1>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l1"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
+<li class="toctree-l1"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/migrating.html
index e19e559,0000000..841bda6
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/migrating.html
+++ b/core/doc/admin/maintenance/migrating.html
@@@ -1,160 -1,0 +1,160 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Migrating ownCloud Installations — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Maintenance" href="index.html" />
+ <link rel="next" title="Issues" href="../issues/index.html" />
+ <link rel="prev" title="Restoring ownCloud" href="restore.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="migrating-owncloud-installations">
+<h1>Migrating ownCloud Installations<a class="headerlink" href="#migrating-owncloud-installations" title="Permalink to this headline">¶</a></h1>
+<p>To migrate an ownCloud install, follow those steps:</p>
+<ol class="arabic simple">
+<li>Backup data/config folders and your database (look at “Backing Up ownCloud”)</li>
+<li>Move your data</li>
+<li>Restore your data/config folders and your database (look at “Restore ownCloud”)</li>
+<li>Update config.php of any changes to your database connection</li>
+</ol>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/restore.html
index 83e64fe,0000000..eebd99a
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/restore.html
+++ b/core/doc/admin/maintenance/restore.html
@@@ -1,198 -1,0 +1,198 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Restoring ownCloud — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Maintenance" href="index.html" />
+ <link rel="next" title="Migrating ownCloud Installations" href="migrating.html" />
+ <link rel="prev" title="Updating ownCloud" href="update.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="update.html">Updating ownCloud</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Restoring ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#restore-folders">Restore Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#restore-database">Restore Database</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="restoring-owncloud">
+<h1>Restoring ownCloud<a class="headerlink" href="#restoring-owncloud" title="Permalink to this headline">¶</a></h1>
+<p>To restore an ownCloud installation there are three main things you need to restore:</p>
+<ol class="arabic simple">
+<li>The config folder</li>
+<li>The data folder</li>
+<li>The database</li>
+</ol>
+<div class="section" id="restore-folders">
+<h2>Restore Folders<a class="headerlink" href="#restore-folders" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This guide assumes that your previous backup is called “owncloud-dirbkp”</p>
+</div>
+<p>Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
+your ownCloud environment. You could use this command:</p>
+<div class="highlight-python"><pre>rsync -Aax owncloud-dirbkp/ owncloud/</pre>
+</div>
+</div>
+<div class="section" id="restore-database">
+<h2>Restore Database<a class="headerlink" href="#restore-database" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This guide assumes that your previous backup is called “owncloud-sqlbkp.bak”</p>
+</div>
+<div class="section" id="mysql">
+<h3>MySQL<a class="headerlink" href="#mysql" title="Permalink to this headline">¶</a></h3>
+<p>MySQL is the recommended database engine. To backup MySQL:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mysql</span> <span class="o">-</span><span class="n">h</span> <span class="p">[</span><span class="n">server</span><span class="p">]</span> <span class="o">-</span><span class="n">u</span> <span class="p">[</span><span class="n">username</span><span class="p">]</span> <span class="o">-</span><span class="n">p</span><span class="p">[</span><span class="n">password</span><span class="p">]</span> <span class="o">< [...]
+</pre></div>
+</div>
+</div>
+<div class="section" id="sqlite">
+<h3>SQLite<a class="headerlink" href="#sqlite" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>sqlite3 data/owncloud.db .dump < owncloud-sqlbkp.bak</pre>
+</div>
+</div>
+<div class="section" id="postgresql">
+<h3>PostgreSQL<a class="headerlink" href="#postgresql" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><pre>PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username] owncloud-sqlbkp.bak</pre>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/maintenance/update.html
index 1bdafb5,0000000..1d0c77b
mode 100644,000000..100644
--- a/core/doc/admin/maintenance/update.html
+++ b/core/doc/admin/maintenance/update.html
@@@ -1,215 -1,0 +1,215 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Updating ownCloud — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Maintenance" href="index.html" />
+ <link rel="next" title="Restoring ownCloud" href="restore.html" />
+ <link rel="prev" title="Backing up ownCloud" href="backup.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Maintenance</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="backup.html">Backing up ownCloud</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Updating ownCloud</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#update">Update</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#upgrade">Upgrade</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="restore.html">Restoring ownCloud</a></li>
+<li class="toctree-l2"><a class="reference internal" href="migrating.html">Migrating ownCloud Installations</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="updating-owncloud">
+<h1>Updating ownCloud<a class="headerlink" href="#updating-owncloud" title="Permalink to this headline">¶</a></h1>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you have installed ownCloud from a repository, your package management should take care of it. Probably
+you will need to look for compatible third party applications yourself. <strong>Always do backups anyway.</strong></p>
+</div>
+<div class="section" id="update">
+<h2>Update<a class="headerlink" href="#update" title="Permalink to this headline">¶</a></h2>
+<p>Updating means updating ownCloud to the latest <em>point release</em>, e.g. ownCloud 5.0.13 → 5.0.14a. This procedure uses the
+ownCloud updater plugin called “Updater”: it’s an internal application already present in your ownCloud installation.</p>
+<p>To update ownCloud, follow those steps:</p>
+<ol class="arabic simple">
+<li>Make a backup of the ownCloud folder and the database.</li>
+<li>Make sure that updater plugin is enabled.</li>
+<li>Navigate to the ‘Admin’ page.</li>
+<li>Click ‘Update’.</li>
+<li>Refresh the page with Ctrl+F5.</li>
+</ol>
+<p>If this procedure doesn’t work (for example, ownCloud 5.0.10 doesn’t show new any new version) you could try to perform
+a full upgrade to update to the latest point release (see below).</p>
+</div>
+<div class="section" id="upgrade">
+<h2>Upgrade<a class="headerlink" href="#upgrade" title="Permalink to this headline">¶</a></h2>
+<p>Upgrade is to bring an ownCloud instance to a new <em>major release</em>, e.g.
+ownCloud 5.0.14a → 6.0.2. Always do backups anyway.</p>
+<p>To upgrade ownCloud, follow those steps:</p>
+<ol class="arabic">
+<li><p class="first">Make sure that you ran the latest point release of the major ownCloud
+version, e.g. 5.0.14a in the 5.0 series. If not, update to that version first
+(see above).</p>
+</li>
+<li><p class="first">Make a backup of the ownCloud folder and the database.</p>
+</li>
+<li><p class="first">Download the latest version to the working directory:</p>
+<div class="highlight-python"><pre>wget http://download.owncloud.org/community/owncloud-latest.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Deactivate all third party applications.</p>
+</li>
+<li><p class="first">Delete everything from your ownCloud installation directory, except data and
+config. Assuming that it’s your working directory, you could execute this command:</p>
+<div class="highlight-python"><pre>ls | grep -v 'data\|config' | xargs rm -r</pre>
+</div>
+</li>
+<li><p class="first">Unpack the release tarball in the ownCloud directory (or copy the
+files thereto). Assuming that your installation directory is called ‘owncloud’ and that it’s inside your working
+directory, you could execute this command:</p>
+<div class="highlight-python"><pre>tar xfj owncloud-latest.tar.bz2</pre>
+</div>
+</li>
+<li><p class="first">Set the permissions properly</p>
+</li>
+<li><p class="first">With the next page request the update procedures will run.</p>
+</li>
+<li><p class="first">If you had 3rd party applications, check if they provide versions compatible
+with the new release. If so, install and enable them, update procedures will run if needed.</p>
+</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/Checking_available_space.html
index cb81c1c,0000000..4e9df87
mode 100644,000000..100644
--- a/core/doc/admin/quota/Checking_available_space.html
+++ b/core/doc/admin/quota/Checking_available_space.html
@@@ -1,149 -1,0 +1,149 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Checking available space — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="checking-available-space">
+<h1>Checking available space<a class="headerlink" href="#checking-available-space" title="Permalink to this headline">¶</a></h1>
+<p>A user can check their available space on the Personal page.</p>
+<p><img alt="10000000000003A800000039364066E4_png" src="../_images/10000000000003A800000039364066E4.png" style="width: 6.5in; height: 0.3957in;" /></p>
+<p>The available space for a given user is calculated using the following formula:</p>
+<p><img alt="10000000000002BB000000266DB6AD1A_png" src="../_images/10000000000002BB000000266DB6AD1A.png" style="width: 6.5in; height: 0.3535in;" /></p>
+<p>Where disk_free_space is the space available on the partition where the user’s home storage is located on the server.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/Excluded_from_quota.html
index e0d91d6,0000000..44a4538f
mode 100644,000000..100644
--- a/core/doc/admin/quota/Excluded_from_quota.html
+++ b/core/doc/admin/quota/Excluded_from_quota.html
@@@ -1,173 -1,0 +1,173 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Excluded from quota — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="excluded-from-quota">
+<h1>Excluded from quota<a class="headerlink" href="#excluded-from-quota" title="Permalink to this headline">¶</a></h1>
+<p>The following sections describe information which is not counted in a user’s quota.</p>
+<div class="section" id="metadata-and-cache">
+<h2>Metadata and cache<a class="headerlink" href="#metadata-and-cache" title="Permalink to this headline">¶</a></h2>
+<p>Application metadata and cached information are excluded from total used space.
+Examples of such data are thumbnails (icon previews, pictures app), temporary files, and encryption keys.</p>
+</div>
+<div class="section" id="deleted-files">
+<h2>Deleted Files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h2>
+<p>Files which have been moved to the trash bin do not count against a user’s quota.
+Deleted items are permanently deleted, oldest to newest, should the user run out of space to make room for new files.</p>
+<p>For example, if the user has a 10GB quota, and has used 4GB of space and 5GB in the trash bin, the user will still have 6GB available space.
+If, however, the user uploads 6GB, ownCloud will permanently delete files from the trash bin in order to make room for the new files.</p>
+</div>
+<div class="section" id="version-control">
+<h2>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h2>
+<p>Older versions do not count against the user’s quota.
+The versions app will delete old versions, oldest to newest, should the user run out of space to make room for new files.</p>
+<p>For example, if the user has a 10GB quota, and has used 4GB and 5GB is used on older versions, the user will still have 6GB available space.
+If, however, the user uploads 6GB, ownCloud will discard older versions to make room for the new files.</p>
+</div>
+<div class="section" id="encryption">
+<h2>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h2>
+<p>Encrypted files are slightly larger than their unencrypted equivalents.
+The unencrypted file size is used to determine the quota.</p>
+</div>
+<div class="section" id="external-storage">
+<h2>External Storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h2>
+<p>External storage, mounted by either a user or the admin, is not taken into consideration when calculating the user’s storage.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/Introduction.html
index 983c24f,0000000..01dfdd6
mode 100644,000000..100644
--- a/core/doc/admin/quota/Introduction.html
+++ b/core/doc/admin/quota/Introduction.html
@@@ -1,152 -1,0 +1,152 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud allows the admin to specify a storage quota for users.
+This quota is the maximum space a user is allowed to utilize for files located in their home storage.</p>
+<p>The users quota is set in the Users page within ownCloud when creating a user.</p>
+<p><img alt="10000000000003DF000000D953A456B6_png" src="../_images/10000000000003DF000000D953A456B6.png" style="width: 6.5in; height: 1.4228in;" /></p>
+<p>Each user can have a different quota (shown above in the Storage column).
+In addition, there is a default quota should a user not have a quota specified.</p>
+<p>It is important to note that when setting a quota, the administrator needs to be aware that it applies only to the actual files and not the metadata.
+This means when allocating a quota, the admin should make sure at least 10% more space is available for each user.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/Sharing.html
index 2205f4d,0000000..87bd015
mode 100644,000000..100644
--- a/core/doc/admin/quota/Sharing.html
+++ b/core/doc/admin/quota/Sharing.html
@@@ -1,163 -1,0 +1,163 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Sharing — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="sharing">
+<h1>Sharing<a class="headerlink" href="#sharing" title="Permalink to this headline">¶</a></h1>
+<p>Shared files or directories are counted against the owner’s quota and not the “shared-to” user’s quota.</p>
+<div class="section" id="shared-files">
+<h2>Shared Files<a class="headerlink" href="#shared-files" title="Permalink to this headline">¶</a></h2>
+<p>When user A shares a file with user B, the size of the file will be counted against user A’s quota.
+This is the case even if the file is modified by user B or if user B increases the file size.</p>
+</div>
+<div class="section" id="shared-directories">
+<h2>Shared Directories<a class="headerlink" href="#shared-directories" title="Permalink to this headline">¶</a></h2>
+<p>When user A shares a directory with User B, all files uploaded to that directory by user B will count against user A’s quota.
+Likewise, files within that directory which are modified by user B will count against user A’s quota.</p>
+</div>
+<div class="section" id="resharing">
+<h2>Resharing<a class="headerlink" href="#resharing" title="Permalink to this headline">¶</a></h2>
+<p>If user A shares a file with user B who then reshares a file to user C, the space occupied by that file is counted against user A’s quota.</p>
+</div>
+<div class="section" id="public-sharing-with-upload-permission">
+<h2>Public sharing with upload permission<a class="headerlink" href="#public-sharing-with-upload-permission" title="Permalink to this headline">¶</a></h2>
+<p>If user A publicly shares a directory via a link and enables “public upload” permission, files uploaded to that directory from the outside are counted against user A’s quota.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/Table_of_Contents.html
index d069d7f,0000000..87526ac
mode 100644,000000..100644
--- a/core/doc/admin/quota/Table_of_Contents.html
+++ b/core/doc/admin/quota/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374966628>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/quota/index.html
index 0064c6f,0000000..4b48e0d
mode 100644,000000..100644
--- a/core/doc/admin/quota/index.html
+++ b/core/doc/admin/quota/index.html
@@@ -1,164 -1,0 +1,164 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Quota Calculations</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Checking_available_space.html">Checking available space</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Sharing.html">Sharing</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Sharing.html#shared-files">Shared Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Sharing.html#shared-directories">Shared Directories</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Sharing.html#resharing">Resharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Sharing.html#public-sharing-with-upload-permission">Public sharing with upload permission</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Excluded_from_quota.html">Excluded from quota</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Excluded_from_quota.html#metadata-and-cache">Metadata and cache</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Excluded_from_quota.html#deleted-files">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Excluded_from_quota.html#version-control">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Excluded_from_quota.html#encryption">Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Excluded_from_quota.html#external-storage">External Storage</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/search.html
index 812f4f2,0000000..cd6fd0f
mode 100644,000000..100644
--- a/core/doc/admin/search.html
+++ b/core/doc/admin/search.html
@@@ -1,169 -1,0 +1,169 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Search — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/searchtools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="index.html" />
+ <script type="text/javascript">
+ jQuery(function() { Search.loadIndex("searchindex.js"); });
+ </script>
+
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <h1 id="search-documentation">Search</h1>
+ <div id="fallback" class="admonition warning">
+ <script type="text/javascript">$('#fallback').hide();</script>
+ <p>
+ Please activate JavaScript to enable the search
+ functionality.
+ </p>
+ </div>
+ <p>
+ From here you can search these documents. Enter your search
+ words into the box below and click "search". Note that the search
+ function will automatically search for all of the words. Pages
+ containing fewer words won't appear in the result list.
+ </p>
+ <form action="" method="get">
+ <input type="text" name="q" value="" />
+ <input type="submit" value="search" />
+ <span id="search-progress" style="padding-left: 10px"></span>
+ </form>
+
+ <div id="search-results">
+
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Contents.html
index 82f657b,0000000..74077d8
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Contents.html
+++ b/core/doc/admin/sharing_api/Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="contents">
+<h1>Contents<a class="headerlink" href="#contents" title="Permalink to this headline">¶</a></h1>
+<p>` <<a class="reference external" href="file:///C:/Users/ser72/Desktop/S3_parent/Support/DOCUMENTS/Community/HYPERLINK#_Toc378743796">file:///C:/Users/ser72/Desktop/S3_parent/Support/DOCUMENTS/Community/HYPERLINK#_Toc378743796</a>>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Create_a_new_Share.html
index 824b959,0000000..1be6a17
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Create_a_new_Share.html
+++ b/core/doc/admin/sharing_api/Create_a_new_Share.html
@@@ -1,408 -1,0 +1,408 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Create a new Share — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="create-a-new-share">
+<h1>Create a new Share<a class="headerlink" href="#create-a-new-share" title="Permalink to this headline">¶</a></h1>
+<p>To create a new share the following may be used.
+This allows sharing with a user or group or as a link.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="14%" />
+<col width="32%" />
+<col width="6%" />
+<col width="48%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Syntax</td>
+<td><Base URL></td>
+<td> </td>
+<td> </td>
+</tr>
+<tr class="row-even"><td>Method</td>
+<td>POST</td>
+<td> </td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td>Mandatory Argument</td>
+<td>path</td>
+<td>string</td>
+<td>Full path of the file/folder being shared</td>
+</tr>
+<tr class="row-even"><td>Mandatory Argument</td>
+<td>shareType</td>
+<td>int</td>
+<td>‘0’ = user, ‘1’ = group, ‘3’ = Public link</td>
+</tr>
+<tr class="row-odd"><td>Argument</td>
+<td>shareWith</td>
+<td>string</td>
+<td>User/group ID with who the file should be shared.
+This is mandatory for shareType of 0 or 1</td>
+</tr>
+<tr class="row-even"><td>Argument</td>
+<td>publicUpload</td>
+<td>boolean</td>
+<td><p class="first">If ‘false’ (default) public cannot upload to a public shared folder</p>
+<p>If ‘true’ public can upload to a shared folder</p>
+<p class="last">Only available for public link shares</p>
+</td>
+</tr>
+<tr class="row-odd"><td>Argument</td>
+<td>password</td>
+<td>string</td>
+<td><p class="first">Password to protect a public link share</p>
+<p class="last">Only available for public link shares</p>
+</td>
+</tr>
+<tr class="row-even"><td>Argument</td>
+<td>permissions</td>
+<td>int</td>
+<td>From table in section 2.2 for user or group shares</td>
+</tr>
+<tr class="row-odd"><td>Result</td>
+<td>XML Code with share ID of newly created share</td>
+<td> </td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+<p>The following is a list of returned status codes:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="35%" />
+<col width="65%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>HTTP Status Code</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>100</td>
+<td>Successful</td>
+</tr>
+<tr class="row-odd"><td>400</td>
+<td>Unknown Share type</td>
+</tr>
+<tr class="row-even"><td>403</td>
+<td>Public Upload disabled by admin</td>
+</tr>
+<tr class="row-odd"><td>404</td>
+<td>File couldn’t be shared</td>
+</tr>
+</tbody>
+</table>
+<div class="section" id="poster-share-as-a-link">
+<h2>Poster – Share as a link<a class="headerlink" href="#poster-share-as-a-link" title="Permalink to this headline">¶</a></h2>
+<p>The following example shares the file “test/Lab.txt” as a public link</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Field</td>
+<td>Value</td>
+</tr>
+<tr class="row-even"><td><strong>URL</strong></td>
+<td>Base URL for the API of the ownCloud server</td>
+</tr>
+<tr class="row-odd"><td><strong>User Auth</strong></td>
+<td>User ID of the file owner</td>
+</tr>
+<tr class="row-even"><td><strong>Password</strong></td>
+<td>User’s Password</td>
+</tr>
+<tr class="row-odd"><td><strong>Name</strong></td>
+<td>Argument being passed</td>
+</tr>
+<tr class="row-even"><td><strong>Value</strong></td>
+<td>Full path of file/folder shared</td>
+</tr>
+</tbody>
+</table>
+<p><img alt="1000000000000298000001874D3CA506_png" src="../_images/1000000000000298000001874D3CA506.png" style="width: 6.5in; height: 3.828in;" /></p>
+<p>Navigate to the “Content to Send” tab and select “Body from Parameters”</p>
+<p><img alt="1000000000000298000001870B0581FA_png" src="../_images/1000000000000298000001870B0581FA.png" style="width: 6.5in; height: 3.828in;" /></p>
+<p>Select POST.</p>
+</div>
+<div class="section" id="curl-share-as-link">
+<h2>Curl – Share as link<a class="headerlink" href="#curl-share-as-link" title="Permalink to this headline">¶</a></h2>
+<p>#curl <a class="reference external" href="http:/">http:/</a>/<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares -k -u user:password -X POST –data “path=<file>&shareType=3”</p>
+<p>#curl
+<a class="reference external" href="http://192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares">http://192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares</a></p>
+<p>-k -u ser72_oc6:Password01 -X POST –data “path=test/Lab.txt&shareType=3”</p>
+</div>
+<div class="section" id="output">
+<h2>Output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="77%" />
+<col width="23%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status = 100: successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><id>9</id></td>
+<td>Share ID = 9</td>
+</tr>
+<tr class="row-even"><td><url>http://192.168.1.63/owncloud6RC3/public.php?service=files&t=e1947aaeaa2b88a69cc1e90bf27ddfe2</url></td>
+<td>Share Link.
+Send this to the desired users</td>
+</tr>
+<tr class="row-odd"><td><token>e1947aaeaa2b88a69cc1e90bf27ddfe2</token></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><strong></ocs></strong></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="poster-share-with-user">
+<h2>Poster – Share with user<a class="headerlink" href="#poster-share-with-user" title="Permalink to this headline">¶</a></h2>
+<p>The following example shares a file called “test/Lab.txt” with user “ser72”</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Field</td>
+<td>Value</td>
+</tr>
+<tr class="row-even"><td><strong>URL</strong></td>
+<td>Base URL for the API of the ownCloud server</td>
+</tr>
+<tr class="row-odd"><td><strong>User Auth</strong></td>
+<td>User ID of the file owner</td>
+</tr>
+<tr class="row-even"><td><strong>Password</strong></td>
+<td>User’s Password</td>
+</tr>
+<tr class="row-odd"><td><strong>Name</strong></td>
+<td>Argument being passed</td>
+</tr>
+<tr class="row-even"><td><strong>Value</strong></td>
+<td>Full path of file/folder shared</td>
+</tr>
+</tbody>
+</table>
+<p><img alt="1000000000000289000001A9D7F3941F_png" src="../_images/1000000000000289000001A9D7F3941F.png" style="width: 6.5in; height: 4.2563in;" /></p>
+<p>Navigate to the “Content to Send Tab” and select “Body from Parameters”</p>
+<p><img alt="10000000000002950000019EF5732E36_png" src="../_images/10000000000002950000019EF5732E36.png" style="width: 6.5in; height: 4.0701in;" /></p>
+<p>Select POST.</p>
+</div>
+<div class="section" id="curl-share-with-user">
+<h2>Curl – Share with User<a class="headerlink" href="#curl-share-with-user" title="Permalink to this headline">¶</a></h2>
+<p>#curl <a class="reference external" href="http:/">http:/</a>/<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares -k -u user:password -X POST –data “path=<file>&shareType=0&shareWith=<user>”</p>
+<p>#curl
+<a class="reference external" href="http://192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares">http://192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares</a></p>
+<p>-k -u ser72_oc6:Password01 -X POST –data “path=test/Lab.txt&shareType=0&shareWith=ser72”</p>
+</div>
+<div class="section" id="id2">
+<h2>output<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="55%" />
+<col width="45%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status: 100: Successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><id>10</id></td>
+<td>Share ID = 10</td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Delete_Share.html
index bb6e617,0000000..9e83841
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Delete_Share.html
+++ b/core/doc/admin/sharing_api/Delete_Share.html
@@@ -1,231 -1,0 +1,231 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Delete Share — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="delete-share">
+<h1>Delete Share<a class="headerlink" href="#delete-share" title="Permalink to this headline">¶</a></h1>
+<p>The following method should be used in the event that a file share should be removed.</p>
+<p>Note: the share ID can be obtained from the output of any of the previous Share API calls or the creation of a new share.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="30%" />
+<col width="70%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Syntax</td>
+<td><Base URL>/<share id></td>
+</tr>
+<tr class="row-even"><td>Method</td>
+<td>DELETE</td>
+</tr>
+<tr class="row-odd"><td>Argument</td>
+<td>Share ID (int)</td>
+</tr>
+</tbody>
+</table>
+<p>The following is a list of returned status codes:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>HTTP Status Code</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>100</td>
+<td>Successful</td>
+</tr>
+<tr class="row-odd"><td>404</td>
+<td>File couldn’t be deleted</td>
+</tr>
+</tbody>
+</table>
+<div class="section" id="poster">
+<h2>Poster<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
+<p>To remove the share identified by ID 10, use the following method.</p>
+<p><img alt="10000000000002910000018B31D51F03_png" src="../_images/10000000000002910000018B31D51F03.png" style="width: 6.5in; height: 3.9075in;" /></p>
+<p>Press DELETE</p>
+</div>
+<div class="section" id="curl">
+<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
+<p>#curl –X “DELETE” <a class="reference external" href="http:/">http:/</a>/<user>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/files/<share_id></p>
+<p>#curl –X “DELETE”
+<a class="reference external" href="http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares/10">http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares/10</a></p>
+</div>
+<div class="section" id="output">
+<h2>output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="56%" />
+<col width="44%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status=100: Successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Get_All_Shares.html
index a1c7c78,0000000..a158b57
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Get_All_Shares.html
+++ b/core/doc/admin/sharing_api/Get_All_Shares.html
@@@ -1,305 -1,0 +1,305 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Get All Shares — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="get-all-shares">
+<h1>Get All Shares<a class="headerlink" href="#get-all-shares" title="Permalink to this headline">¶</a></h1>
+<p>To obtain a list of all files shared by a user, the following can be used.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="17%" />
+<col width="83%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Syntax</td>
+<td><Base URL></td>
+</tr>
+<tr class="row-even"><td>Method</td>
+<td>GET</td>
+</tr>
+<tr class="row-odd"><td>Result</td>
+<td>XML code with all shares by the user</td>
+</tr>
+</tbody>
+</table>
+<p>The following is a list of returned status codes:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="46%" />
+<col width="54%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>HTTP Status Code</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>100</td>
+<td>Successful</td>
+</tr>
+<tr class="row-odd"><td>404</td>
+<td>Couldn’t get shares</td>
+</tr>
+</tbody>
+</table>
+<div class="section" id="poster">
+<h2>Poster:<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Field</td>
+<td>Value</td>
+</tr>
+<tr class="row-even"><td><strong>URL</strong></td>
+<td>Base URL for the API of the ownCloud server</td>
+</tr>
+<tr class="row-odd"><td><strong>User Auth</strong></td>
+<td>User ID performing the Share</td>
+</tr>
+<tr class="row-even"><td><strong>Password</strong></td>
+<td>User’s Password</td>
+</tr>
+</tbody>
+</table>
+<p><img alt="10000201000002FC000001DC2DDAD2F1_png" src="../_images/10000201000002FC000001DC2DDAD2F1.png" /></p>
+<p>Select “GET”</p>
+</div>
+<div class="section" id="curl">
+<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
+<p>The user is the id of the user who shares the files.
+The password belongs to that user as well.</p>
+<p>#curl <a class="reference external" href="http:/">http:/</a>/<user>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
+<p>#curl
+<a class="reference external" href="http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/appsi/files_sharing/api/v1/shares">http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/appsi/files_sharing/api/v1/shares</a></p>
+</div>
+<div class="section" id="output">
+<h2>output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="55%" />
+<col width="45%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status = 100: Successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><id>6</id></td>
+<td>Share ID = 6</td>
+</tr>
+<tr class="row-odd"><td><item_type>file</item_type></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><item_source>138</item_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><parent/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_type>0</share_type></td>
+<td>Share Type = 0: User share</td>
+</tr>
+<tr class="row-odd"><td><share_with>ser72</share_with></td>
+<td>File shared with user ser72</td>
+</tr>
+<tr class="row-even"><td><file_source>138</file_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><path>/Lab.txt</path></td>
+<td>File name /Lab.txt</td>
+</tr>
+<tr class="row-even"><td><permissions>27</permissions></td>
+<td>Permissions: Re-share, Read, Delete, Update</td>
+</tr>
+<tr class="row-odd"><td><stime>1386697532</stime></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><expiration/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><token/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><storage>4</storage></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><mail_send>0</mail_send></td>
+<td>Do not send email alerting of the share</td>
+</tr>
+<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Get_Information_about_a_known_share.html
index d23fa83,0000000..17e99ae
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Get_Information_about_a_known_share.html
+++ b/core/doc/admin/sharing_api/Get_Information_about_a_known_share.html
@@@ -1,309 -1,0 +1,309 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Get Information about a known share — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="get-information-about-a-known-share">
+<h1>Get Information about a known share<a class="headerlink" href="#get-information-about-a-known-share" title="Permalink to this headline">¶</a></h1>
+<p>To get information about a share when the share ID is known, use the following.</p>
+<p>Note: the share ID can be obtained from the output of any of the previous Share API calls or the creation of a new share.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Syntax</td>
+<td><Base URL>/<share id></td>
+</tr>
+<tr class="row-even"><td>Method</td>
+<td>GET</td>
+</tr>
+<tr class="row-odd"><td>Arguments</td>
+<td>Share id (int)</td>
+</tr>
+<tr class="row-even"><td>Result</td>
+<td>XML code with share information</td>
+</tr>
+<tr class="row-odd"><td> </td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+<p>The following is a list of returned status codes:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="46%" />
+<col width="54%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>HTTP Status Code</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>100</td>
+<td>Successful</td>
+</tr>
+<tr class="row-odd"><td>404</td>
+<td>Share doesn’t exist</td>
+</tr>
+</tbody>
+</table>
+<div class="section" id="poster">
+<h2>Poster<a class="headerlink" href="#poster" title="Permalink to this headline">¶</a></h2>
+<p>This example shows the output of share information for share ID “7”</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Field</td>
+<td>Value</td>
+</tr>
+<tr class="row-even"><td><strong>URL</strong></td>
+<td>Base URL for the API of the ownCloud server/<share id></td>
+</tr>
+<tr class="row-odd"><td><strong>User Auth</strong></td>
+<td>User ID of the file owner</td>
+</tr>
+<tr class="row-even"><td><strong>Password</strong></td>
+<td>User’s Password</td>
+</tr>
+</tbody>
+</table>
+<p><img alt="1000000000000288000001A1D5BE4881_png" src="../_images/1000000000000288000001A1D5BE4881.png" style="width: 6.5in; height: 4.1819in;" /></p>
+</div>
+<div class="section" id="curl">
+<h2>Curl<a class="headerlink" href="#curl" title="Permalink to this headline">¶</a></h2>
+<p>#curl <a class="reference external" href="http:/">http:/</a>/<user>:<passowrd>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares/<share_id></p>
+<p>#curl <a class="reference external" href="http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares/7">http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares/7</a></p>
+</div>
+<div class="section" id="output">
+<h2>output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="70%" />
+<col width="30%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td>Status=100: successful</td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><id>7</id></td>
+<td>Share ID = 7</td>
+</tr>
+<tr class="row-odd"><td><item_type>file</item_type></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><item_source>675</item_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><parent/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_type>0</share_type></td>
+<td>Share type = 0: user</td>
+</tr>
+<tr class="row-odd"><td><share_with>ser72</share_with></td>
+<td>Share with user ser72</td>
+</tr>
+<tr class="row-even"><td><file_source>675</file_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><permissions>27</permissions></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><stime>1386698116</stime></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><expiration/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><token/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><storage>4</storage></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><mail_send>0</mail_send></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.html
index ae5e8c5,0000000..7c2734c
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.html
+++ b/core/doc/admin/sharing_api/Get_Shares_from_a_Specific_File_or_Folder.html
@@@ -1,500 -1,0 +1,500 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Get Shares from a Specific File or Folder — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="get-shares-from-a-specific-file-or-folder">
+<h1>Get Shares from a Specific File or Folder<a class="headerlink" href="#get-shares-from-a-specific-file-or-folder" title="Permalink to this headline">¶</a></h1>
+<p>The following will provide a list shares for a specific file.
+The input is the full path of the desired file.
+The output is a list of everyone who has the file shared with them.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="18%" />
+<col width="17%" />
+<col width="7%" />
+<col width="58%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><strong>Syntax</strong></td>
+<td><Base URL></td>
+<td> </td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><strong>Method</strong></td>
+<td>GET</td>
+<td> </td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><strong>Mandatory Argument</strong></td>
+<td>Path</td>
+<td>string</td>
+<td>Path to file or folder</td>
+</tr>
+<tr class="row-even"><td><strong>Argument</strong></td>
+<td>Reshares</td>
+<td>boolean</td>
+<td><p class="first">If set to ‘false’ (default), only shares from the current user are returned</p>
+<p class="last">If set to ‘true’, all shares from the given file are returned</p>
+</td>
+</tr>
+<tr class="row-odd"><td><strong>Argument</strong></td>
+<td>Subfiles</td>
+<td>boolean</td>
+<td><p class="first">If set to ‘false’ (default), lists only the folder being shared</p>
+<p class="last">If set to ‘true’, all shared files within the folder are returned.</p>
+</td>
+</tr>
+<tr class="row-even"><td><strong>Result</strong></td>
+<td>XML code with shares</td>
+<td> </td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+<p>The following is a list of returned status codes:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>HTTP Status Code</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>100</td>
+<td>Successful</td>
+</tr>
+<tr class="row-odd"><td>400</td>
+<td>Not a directory (if the ‘subfile’ argument was used)</td>
+</tr>
+<tr class="row-even"><td>404</td>
+<td>File does not exist</td>
+</tr>
+</tbody>
+</table>
+<div class="section" id="poster-default-arguments">
+<h2>Poster - Default arguments<a class="headerlink" href="#poster-default-arguments" title="Permalink to this headline">¶</a></h2>
+<p>This example shows the output of share information for “test share api/ieee.txt”</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Field</td>
+<td>Value</td>
+</tr>
+<tr class="row-even"><td><strong>URL</strong></td>
+<td>Base URL for the API of the ownCloud server</td>
+</tr>
+<tr class="row-odd"><td><strong>User Auth</strong></td>
+<td>User ID of the file owner</td>
+</tr>
+<tr class="row-even"><td><strong>Password</strong></td>
+<td>User’s Password</td>
+</tr>
+<tr class="row-odd"><td><strong>Name</strong></td>
+<td>Argument being passed</td>
+</tr>
+<tr class="row-even"><td><strong>Value</strong></td>
+<td>Full path of file/folder shared</td>
+</tr>
+</tbody>
+</table>
+<p>Navigate to the “Parameters” tab and input the Name and value.</p>
+<p><img alt="10000000000002720000013FB6EDA793_png" src="../_images/10000000000002720000013FB6EDA793.png" style="width: 6.5in; height: 3.3126in;" /></p>
+<p>Navigate to the “Content to Send” tab and select “Body from Parameters” to move the required parameters to the query.</p>
+<p><img alt="1000000000000291000001951B69B9A6_png" src="../_images/1000000000000291000001951B69B9A6.png" style="width: 6.5in; height: 4.0071in;" /></p>
+<p>Select GET.</p>
+</div>
+<div class="section" id="curl-default-configuration">
+<h2>Curl – default configuration:<a class="headerlink" href="#curl-default-configuration" title="Permalink to this headline">¶</a></h2>
+<p>#curl –G –data “path=test_share_api/ieee.txt” <a class="reference external" href="http:/">http:/</a>/<userid>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
+<p>#curl –G –data “path=test_share_api/ieee.txt”
+<a class="reference external" href="http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares">http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares</a></p>
+</div>
+<div class="section" id="output">
+<h2>output<a class="headerlink" href="#output" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="64%" />
+<col width="36%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status=100: Successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><id>7</id></td>
+<td>Share ID=7</td>
+</tr>
+<tr class="row-odd"><td><item_type>file</item_type></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><item_source>675</item_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><parent/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_type>0</share_type></td>
+<td>Share Type=0: user</td>
+</tr>
+<tr class="row-odd"><td><share_with>ser72</share_with></td>
+<td>Share with user ser72</td>
+</tr>
+<tr class="row-even"><td><file_source>675</file_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
+<td>File /test share api/ieee.txt</td>
+</tr>
+<tr class="row-even"><td><permissions>27</permissions></td>
+<td>Permissions 27</td>
+</tr>
+<tr class="row-odd"><td><stime>1386698116</stime></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><expiration/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><token/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><storage>4</storage></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><mail_send>0</mail_send></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="poster-to-add-another-argument-such-as-re-shares">
+<h2>Poster - To add another argument, such as re-shares:<a class="headerlink" href="#poster-to-add-another-argument-such-as-re-shares" title="Permalink to this headline">¶</a></h2>
+<p>This example shows the output of share information for “test share api/ieee.txt”.
+reshares is set to true which will show output if the file is re-shared by another user.</p>
+<p><img alt="1000000000000304000001B964698779_png" src="../_images/1000000000000304000001B964698779.png" style="width: 6.5in; height: 3.7134in;" /></p>
+<p>Navigate to the “Content to Send” tab and select “Body from Parameters”</p>
+<p><img alt="100000000000029B0000018885B5282E_png" src="../_images/100000000000029B0000018885B5282E.png" style="width: 6.5in; height: 3.8201in;" /></p>
+<p>Select Get</p>
+</div>
+<div class="section" id="curl-to-add-another-argument-such-as-re-shares">
+<h2>Curl – To add another argument, such as re-shares<a class="headerlink" href="#curl-to-add-another-argument-such-as-re-shares" title="Permalink to this headline">¶</a></h2>
+<p>#curl –G –data “path=test_share_api/ieee.tx&reshares=true” <a class="reference external" href="http:/">http:/</a>/<userid>:<password>@<ip>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
+<p>#curl –G –data “path=test_share_api/ieee.tx&reshares=true”
+<a class="reference external" href="http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares">http://ser72_oc6:Password01@192.168.1.63/owncloud/ocs/v1.php/apps/files_sharing/api/v1/shares</a></p>
+</div>
+<div class="section" id="id2">
+<h2>output<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="60%" />
+<col width="40%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td><?xml version=”1.0”?></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><ocs></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><status>ok</status></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><statuscode>100</statuscode></td>
+<td>Status=100: Successful</td>
+</tr>
+<tr class="row-even"><td><message/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></meta></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><id>7</id></td>
+<td>Share id = 7</td>
+</tr>
+<tr class="row-odd"><td><item_type>file</item_type></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><item_source>675</item_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><parent/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_type>0</share_type></td>
+<td>Share Type=0: User</td>
+</tr>
+<tr class="row-odd"><td><share_with>ser72</share_with></td>
+<td>Share with user ser72</td>
+</tr>
+<tr class="row-even"><td><file_source>675</file_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><permissions>27</permissions></td>
+<td>Permissions 27</td>
+</tr>
+<tr class="row-odd"><td><stime>1386698116</stime></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><expiration/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><token/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><storage>4</storage></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><mail_send>0</mail_send></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_with_displayname>ser72</share_with_displayname></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><element></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><id>8</id></td>
+<td>Share id 8</td>
+</tr>
+<tr class="row-even"><td><item_type>file</item_type></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><parent>7</parent></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_type>0</share_type></td>
+<td>Parent share id = 7</td>
+</tr>
+<tr class="row-odd"><td><share_with>ser73</share_with></td>
+<td>Share with ser73</td>
+</tr>
+<tr class="row-even"><td><file_source>675</file_source></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><path>/test share api/ieee.txt</path></td>
+<td>Share file /test share api/ieee.txt</td>
+</tr>
+<tr class="row-even"><td><permissions>19</permissions></td>
+<td>Permissions 19 – read, update, share</td>
+</tr>
+<tr class="row-odd"><td><stime>1386698465</stime></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><expiration/></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><token/></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><storage>4</storage></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td><mail_send>0</mail_send></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td><share_with_displayname>ser73</share_with_displayname></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></element></td>
+<td> </td>
+</tr>
+<tr class="row-even"><td></data></td>
+<td> </td>
+</tr>
+<tr class="row-odd"><td></ocs></td>
+<td> </td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/Introduction.html
index ff2254f,0000000..d9f3a44
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/Introduction.html
+++ b/core/doc/admin/sharing_api/Introduction.html
@@@ -1,188 -1,0 +1,188 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>This document will describe how to use the ownCloud Sharing API.
+The sharing API allows for the creation of new shares, obtaining a list of shares, and deleting shares.
+In addition, information such a lists of files shared to users can be obtained.</p>
+<p>In order to utilize this API, all user ID’s involved in the share, as well as full path names of files is required to be known.</p>
+<p>Two methods will be shown:
+Firefox Plugin “Poster” and Curl via the command line.</p>
+<p>The base URL for all calls to the share API is:
+owncloud_base_url>/ocs/v1.php/apps/files_sharing/api/v1/shares</p>
+<div class="section" id="permissions">
+<h2>Permissions<a class="headerlink" href="#permissions" title="Permalink to this headline">¶</a></h2>
+<p>The following table describes the Permissions of a share.
+The Permissions are contained in the XML code output of the command.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="16%" />
+<col width="84%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Value</td>
+<td>Permissions</td>
+</tr>
+<tr class="row-even"><td><strong>1</strong></td>
+<td>Read only – Default for “public” shares</td>
+</tr>
+<tr class="row-odd"><td><strong>2</strong></td>
+<td>Update</td>
+</tr>
+<tr class="row-even"><td><strong>4</strong></td>
+<td>Create</td>
+</tr>
+<tr class="row-odd"><td><strong>8</strong></td>
+<td>Delete</td>
+</tr>
+<tr class="row-even"><td><strong>16</strong></td>
+<td>Re-share</td>
+</tr>
+<tr class="row-odd"><td><strong>31</strong></td>
+<td>All above – Default for “private” shares</td>
+</tr>
+</tbody>
+</table>
+<p>To obtain combinations, add the desired values together.
+For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sharing_api/index.html
index 1542421,0000000..ce22716
mode 100644,000000..100644
--- a/core/doc/admin/sharing_api/index.html
+++ b/core/doc/admin/sharing_api/index.html
@@@ -1,187 -1,0 +1,187 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Sharing API</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Contents.html">Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Introduction.html#permissions">Permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Get_All_Shares.html">Get All Shares</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Get_All_Shares.html#poster">Poster:</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_All_Shares.html#curl">Curl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_All_Shares.html#output">output</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html">Get Shares from a Specific File or Folder</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#poster-default-arguments">Poster - Default arguments</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#curl-default-configuration">Curl – default configuration:</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#output">output</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#poster-to-add-another-argument-such-as-re-shares">Poster - To add another argument, such as re-shares:</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#curl-to-add-another-argument-such-as-re-shares">Curl – To add another argument, such as re-shares</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Shares_from_a_Specific_File_or_Folder.html#id2">output</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Get_Information_about_a_known_share.html">Get Information about a known share</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Get_Information_about_a_known_share.html#poster">Poster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Information_about_a_known_share.html#curl">Curl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Get_Information_about_a_known_share.html#output">output</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Create_a_new_Share.html">Create a new Share</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#poster-share-as-a-link">Poster – Share as a link</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#curl-share-as-link">Curl – Share as link</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#output">Output</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#poster-share-with-user">Poster – Share with user</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#curl-share-with-user">Curl – Share with User</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Create_a_new_Share.html#id2">output</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Delete_Share.html">Delete Share</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Delete_Share.html#poster">Poster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Delete_Share.html#curl">Curl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Delete_Share.html#output">output</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Advanced_Usage.html
index b9b1f5a,0000000..f4fdd4f
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Advanced_Usage.html
+++ b/core/doc/admin/sync_client/Advanced_Usage.html
@@@ -1,205 -1,0 +1,205 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Advanced Usage — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="advanced-usage">
+<h1>Advanced Usage<a class="headerlink" href="#advanced-usage" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="options">
+<h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">¶</a></h2>
+<p>When invoking the client from the command line, the following options are supported.
+The invocation must be done as the admin user on Windows.</p>
+<ul class="simple">
+<li>-h, –help: opens a window showing all the below options.</li>
+<li>–logwindow: open a window to show log output.</li>
+<li>–logfile <filename>: write log output to file <filename>.</li>
+<li>–logdir <name>: write each sync log output to a new file in directory <name>.</li>
+<li>–logexpire <hours>: removes logs older than <hours> hours.
+To be used with –logdir</li>
+<li>–logflush: flush the log file after every write.</li>
+<li>–confdir <dirname>: Use the given configuration directory.</li>
+</ul>
+</div>
+<div class="section" id="config-file">
+<h2>Config file<a class="headerlink" href="#config-file" title="Permalink to this headline">¶</a></h2>
+<p>The ownCloud client reads a configuration file for certain parameters.</p>
+<p>The locations of the config file is as follows:</p>
+<ul class="simple">
+<li>Linux:
+$HOME/.local/share/data/ownCloud/owncloud.cfg</li>
+<li>Windows:
+%LOCALAPPDATA%owncloudowncloud.cfg</li>
+<li>MAC:
+$HOME/Library/Application Support/owncloud</li>
+</ul>
+<p>The following parameters contained within the config file may be modified:</p>
+<ul class="simple">
+<li>remotePollinterval (default 30000): Poll time for the remote repository in milliseconds</li>
+<li>maxLogLines (default 20000): Maximum count of log lines shown in the long window.</li>
+</ul>
+</div>
+<div class="section" id="comparison-and-conflicts">
+<h2>Comparison and Conflicts<a class="headerlink" href="#comparison-and-conflicts" title="Permalink to this headline">¶</a></h2>
+<p>In a sync run, the client must detect if one of the two repositories have updated files.
+On the local repository, the client traverses the file tree and compares the modification time of each file with the value it was before.
+The previous value is stored in the client’s database.
+If it is not, it means the file was recently added to the local repository.
+Note that on the local side, the modification time is a good attribute to detect changes because it does not depend on time shifts.</p>
+<p>For the remote (i.e., ownCloud server) repository, the client compares the ETag of each file with its previous value.
+Like the client, the previous value is obtained from a database query.
+If the ETag is the same, the file has not changed.</p>
+<p>In case a file has changed on both, the local and remote repositories, since the last sync run, it cannot be determined which version of the file should be used.
+However, it is important not to lose any of the changes.</p>
+<p>This is called a conflict case.
+The client resolves it by creating a conflict file of the older of the two files and saves the newer one under the original file name.
+Conflict files are always created on the client and
+not the server.
+The conflict file has the same name as the original file appended with the timestamp of the conflict detection.</p>
+</div>
+<div class="section" id="ignored-files">
+<h2>Ignored Files<a class="headerlink" href="#ignored-files" title="Permalink to this headline">¶</a></h2>
+<p>The ownCloud client will not sync the following files:</p>
+<ul class="simple">
+<li>Files matching one of the patterns in the Ignored Files Editor.</li>
+<li>Files containing special characters that do not work on certain file systems.</li>
+<li>Files starting in the .csync_journal.db (reserved for journaling).</li>
+<li>Files whose complete path is greater than 256 characters will cause an error and not sync.</li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Introduction.html
index 6554175,0000000..fdc5d9f
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Introduction.html
+++ b/core/doc/admin/sync_client/Introduction.html
@@@ -1,149 -1,0 +1,149 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud Sync Client is a desktop program installed on a user’s computer.
+It allows a user to specify one or more directories on the local machine to sync to the ownCloud server.
+It allows the user to always have the latest files wherever they may be.
+When a change is made to the file on the computer, it will sync to the ownCloud server via the sync client.</p>
+<p>The ownCloud Sync Client is available for Windows, MAC OS X, and various Linux distributions.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Obtaining_the_Client.html
index f67f22f,0000000..d879c22
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Obtaining_the_Client.html
+++ b/core/doc/admin/sync_client/Obtaining_the_Client.html
@@@ -1,160 -1,0 +1,160 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Obtaining the Client — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="obtaining-the-client">
+<h1>Obtaining the Client<a class="headerlink" href="#obtaining-the-client" title="Permalink to this headline">¶</a></h1>
+<p>The latest version of the Client can be obtained on the ownCloud web site.</p>
+<p>The ownCloud client for Windows is provided as a NSIS-based setup file for machine-wide installation.</p>
+<p>Installing the ownCloud client on MAC OS follows the normal app bundle installation pattern:</p>
+<ol class="arabic simple">
+<li>Download the installation file: Click
+ownCloud-x.y.z.dmg
+a window with the ownCloud icon opens.</li>
+<li>In that window, drag the ownCloud application into the
+Applications
+folder.</li>
+<li>On the right side of
+Applications
+, choose
+ownCloud</li>
+</ol>
+<p>The ownCloud client is also provided in a convenient repository for a wide range of Linux distributions.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Setting_up_an_Account.html
index e7410f9,0000000..f84699a
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Setting_up_an_Account.html
+++ b/core/doc/admin/sync_client/Setting_up_an_Account.html
@@@ -1,161 -1,0 +1,161 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Setting up an Account — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="setting-up-an-account">
+<h1>Setting up an Account<a class="headerlink" href="#setting-up-an-account" title="Permalink to this headline">¶</a></h1>
+<p>If no account has been configured, the ownCloud Client will automatically assist in connecting to the ownCloud server after the application has been started.</p>
+<p>The first step is to enter the URL to the ownCloud server.
+This is the same address that is used in the browser.</p>
+<p><img alt="10000000000002650000018CA6A1BE66_png" src="../_images/10000000000002650000018CA6A1BE66.png" style="width: 6.3846in; height: 4.1252in;" /></p>
+<p>Next, enter the username and password.
+These are the same credentials used to log into the web interface.</p>
+<p><img alt="10000000000002690000018D3A8C9F17_png" src="../_images/10000000000002690000018D3A8C9F17.png" style="width: 6.4272in; height: 4.1346in;" /></p>
+<p>Finally, select the folder that the ownCloud Client will sync the contents of the ownCloud account with.
+By default, this folder is called ownCloud, which resides in the home directory.</p>
+<p><img alt="10000000000002650000018E4285E964_png" src="../_images/10000000000002650000018E4285E964.png" style="width: 6.3846in; height: 4.1457in;" /></p>
+<p>At this time, the synchronization between the root directories of the ownCloud server will begin.</p>
+<p>If selecting a local folder that already contains data, there are two options that exist.</p>
+<p><img alt="100000000000026A000001DCAF8778F2_png" src="../_images/100000000000026A000001DCAF8778F2.png" style="width: 6.4374in; height: 4.9583in;" /></p>
+<ul class="simple">
+<li>Keep local data: If selected, the files in the local folder on the client will be synced up to the ownCloud server.</li>
+<li>Start a clean sync: If selected, all files in the local folder on the client will be deleted and therefore not synced to the ownCloud server.</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Table_of_Contents.html
index bd435af,0000000..9656909
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Table_of_Contents.html
+++ b/core/doc/admin/sync_client/Table_of_Contents.html
@@@ -1,146 -1,0 +1,146 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc374017118>`_</p>
+<p>Reviewed by:</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/Visual_Tour.html
index 282816f,0000000..7731c50
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/Visual_Tour.html
+++ b/core/doc/admin/sync_client/Visual_Tour.html
@@@ -1,261 -1,0 +1,261 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Visual Tour — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="visual-tour">
+<h1>Visual Tour<a class="headerlink" href="#visual-tour" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="icon">
+<h2>Icon<a class="headerlink" href="#icon" title="Permalink to this headline">¶</a></h2>
+<p>The ownCloud Client remains in the background and is visible as an icon in the system tray (Windows, KDE), status bar (MAC OS X), or notification area (Ubuntu).</p>
+<p><img alt="100000000000001D0000001E5C455170_png" src="../_images/100000000000001D0000001E5C455170.png" style="width: 0.302in; height: 0.3126in;" /></p>
+</div>
+<div class="section" id="menu">
+<h2>Menu<a class="headerlink" href="#menu" title="Permalink to this headline">¶</a></h2>
+<p>A right click on the icon provides the following menu.</p>
+<p><img alt="10000000000000D2000000F553818155_png" src="../_images/10000000000000D2000000F553818155.png" style="width: 2.1874in; height: 2.552in;" /></p>
+<p>Where:</p>
+<ul class="simple">
+<li>Open ownCloud in browser: Opens the ownCloud web interface.</li>
+<li>Open folder ‘ownCloud’: Opens the local folder.
+If multiple sync targets have been defined, an entry will exist for each local folder.</li>
+<li>Disk Space Indicator: Shows how much space is used on the server.</li>
+<li>Operation indicator: Shows the status of the current sync process, or ‘up to date’ if the client and server are in sync.</li>
+</ul>
+<p><img alt="10000000000000F20000003BAA849B42_png" src="../_images/10000000000000F20000003BAA849B42.png" style="width: 2.5201in; height: 0.6146in;" /></p>
+<ul class="simple">
+<li>Recent changes: shows the last six files modified by sync operations and provides access to the Sync Activity window which lists all changes since the last restart of the ownCloud client.</li>
+<li>Settings…: Provides access to the settings menu.
+Same result as a left click on the icon.</li>
+<li>Help: Opens a browser to display the documentation.</li>
+<li>Sign out: Signs the client out of the server.</li>
+<li>Quit ownCloud: Quits ownCloud, ending a currently running sync.</li>
+</ul>
+</div>
+<div class="section" id="settings">
+<h2>Settings<a class="headerlink" href="#settings" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="account-settings">
+<h3>Account Settings<a class="headerlink" href="#account-settings" title="Permalink to this headline">¶</a></h3>
+<p>The Account Settings tab provides an executive summary about the synced folders in the account and gives the ability to modify them.</p>
+<p><img alt="10000000000002C1000001ED5CECCC6D_png" src="../_images/10000000000002C1000001ED5CECCC6D.png" style="width: 6.5in; height: 4.5453in;" /></p>
+<p>Where:</p>
+<ul class="simple">
+<li>“Connected to <ownCloud instance> as <user>”: Indicates the ownCloud server which the client is syncing with and the user account on that server.</li>
+<li>Add Folder…: Provides the ability to add another folder to sync.</li>
+</ul>
+<p><img alt="10000000000001EE00000164642CCA08_png" src="../_images/10000000000001EE00000164642CCA08.png" style="width: 5.1457in; height: 3.7083in;" /></p>
+<p>The Directory and alias name must be unique.</p>
+<p><img alt="10000000000001F40000016609A0CFCC_png" src="../_images/10000000000001F40000016609A0CFCC.png" style="width: 5.2083in; height: 3.7291in;" /></p>
+<p>Select the folder on the server to sync with.
+It is important to note that, a server folder can only sync to the client one time.
+So, in the above example, the sync is to the server root directory and thus it is not possible to select another folder under the root to sync.</p>
+<ul class="simple">
+<li>Pause/Resume: will pause the current sync or prevent the client from starting a new sync.
+Resume will resume the sync process.</li>
+<li>Remove:
+Will remove the selected folder from being synced.
+This is used, for instance, when there is a desire to sync only a few folders and not the root.
+First, remove the root from sync, then add the folders to sync as desired.</li>
+<li>Storage Usage: Provides further details on the storage utilization on the ownCloud server.</li>
+<li>Edit Ignored Files: provides a list of files which will be ignored, i.e., will not sync between the client and server.
+The ignored files editor allows adding patterns for files or directories that should be excluded from the sync process.
+Besides normal characters, wild cards may be used, an asterisk ‘*’ indicating multiple characters, or a question mark ‘?’ indicating a single character.</li>
+</ul>
+<p><img alt="10000000000001E50000018C3AD09A21_png" src="../_images/10000000000001E50000018C3AD09A21.png" style="width: 5.052in; height: 4.1252in;" /></p>
+<ul class="simple">
+<li>Modify Account: Allows the user to change the ownCloud server being synced to.
+It brings up the Setting up an Account (section
+above) windows.</li>
+</ul>
+</div>
+<div class="section" id="activity">
+<h3>Activity<a class="headerlink" href="#activity" title="Permalink to this headline">¶</a></h3>
+<p>The Activity window, which can be invoked either from the main menu (
+Recent Changes -> Details…
+) or the Activity tab on the left side of the settings window, provides an in-depth account of the recent sync activity.
+It will show files that have not been synced because they are on the ignored files list, or because they cannot be synced in a cross-platform manner due to containing special characters that cannot be stored on certain file systems.</p>
+<p><img alt="10000000000002BB000001EABD7E6DF0_png" src="../_images/10000000000002BB000001EABD7E6DF0.png" style="width: 6.5in; height: 4.5563in;" /></p>
+</div>
+<div class="section" id="general">
+<h3>General<a class="headerlink" href="#general" title="Permalink to this headline">¶</a></h3>
+<p>This tab provides several options:</p>
+<p><img alt="10000000000002BF000001E5B544E7E7_png" src="../_images/10000000000002BF000001E5B544E7E7.png" style="width: 6.5in; height: 4.4839in;" /></p>
+<ul class="simple">
+<li>Launch on System Startup: This option is automatically activated once a user has created his account.
+Unchecking this box will cause the ownCloud client to not launch on startup for a particular user.</li>
+<li>Show Desktop Notifications: When checked, bubble notifications when a set of sync operations has been performed are provided.</li>
+<li>Use Monochrome Icons: Use less obtrusive icons.
+Especially useful on MAC OS.</li>
+<li>About: provides information about authors as well as build conditions.
+This information is valuable when submitting a support request.</li>
+</ul>
+</div>
+<div class="section" id="network">
+<h3>Network<a class="headerlink" href="#network" title="Permalink to this headline">¶</a></h3>
+<p>This tab contains proxy settings and bandwidth limiting settings.</p>
+<p><img alt="10000000000002C3000001EBBD39E47A_png" src="../_images/10000000000002C3000001EBBD39E47A.png" style="width: 6.5in; height: 4.5138in;" /></p>
+<div class="section" id="proxy-settings">
+<h4>Proxy Settings<a class="headerlink" href="#proxy-settings" title="Permalink to this headline">¶</a></h4>
+<ul class="simple">
+<li>No Proxy: Check this if the ownCloud client should circumvent the default proxy on the system.</li>
+<li>Use system proxy: Default value.
+This will follow the system’s proxy settings.
+On Linux it will use the value of the variable
+http_proxy.</li>
+<li>Specify proxy manually as: Allows to specify custom proxy settings.
+If it is required to go through a HTTP(S) proxy server.
+SOCKSv5 on the other hand is useful in special company LAN setups, or in combination with the OpenSSH dynamic application level forwarding feature.</li>
+<li>Host: Enter the host name or IP address of the proxy server followed by the port number.
+HTTP proxies usually listen on ports 8080 (default) or 3128.
+SOCKS server usually listens on port 1080.</li>
+<li>Proxy server requires authentication: Should be checked if the proxy server does not allow anonymous usage.
+If checked, a username and password must be provided.</li>
+</ul>
+</div>
+<div class="section" id="bandwidth-limiting">
+<h4>Bandwidth Limiting<a class="headerlink" href="#bandwidth-limiting" title="Permalink to this headline">¶</a></h4>
+<p>The Download Bandwidth can be either unlimited (default) or limited to a custom value.
+This is the bandwidth available for data flowing from the ownCloud Server to the client.</p>
+<p>The Upload Bandwidth, the bandwidth available or data flowing from the ownCloud client to the server, has an additional option to limit automatically.
+When this option is checked, the ownCloud client will surrender available bandwidth to other applications.
+Use this option if there are issues with real time communication in conjunction with the ownCloud Client.</p>
+</div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/sync_client/index.html
index 1ce8f64,0000000..17bb1c8
mode 100644,000000..100644
--- a/core/doc/admin/sync_client/index.html
+++ b/core/doc/admin/sync_client/index.html
@@@ -1,163 -1,0 +1,163 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Sync Client</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Obtaining_the_Client.html">Obtaining the Client</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Setting_up_an_Account.html">Setting up an Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Visual_Tour.html">Visual Tour</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Visual_Tour.html#icon">Icon</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Visual_Tour.html#menu">Menu</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Visual_Tour.html#settings">Settings</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Advanced_Usage.html">Advanced Usage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Advanced_Usage.html#options">Options</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Advanced_Usage.html#config-file">Config file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Advanced_Usage.html#comparison-and-conflicts">Comparison and Conflicts</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Advanced_Usage.html#ignored-files">Ignored Files</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Adding_Data.html
index 35506c8,0000000..38f2cb9
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Adding_Data.html
+++ b/core/doc/admin/web_guide/Adding_Data.html
@@@ -1,195 -1,0 +1,195 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Adding Data — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="adding-data">
+<h1>Adding Data<a class="headerlink" href="#adding-data" title="Permalink to this headline">¶</a></h1>
+<p>There are a few ways to add data to the ownCloud instance.
+Files may be uploaded or text files may be created directly within ownCloud.
+Folders may also be created directly within the ownCloud web interface.</p>
+<div class="section" id="creation">
+<h2>Creation<a class="headerlink" href="#creation" title="Permalink to this headline">¶</a></h2>
+<p>To create a file or folder, select the New button in section 3 of the main ownCloud screen.</p>
+<p><img alt="1000000000000163000000E9CDA84C92_png" src="../_images/1000000000000163000000E9CDA84C92.png" style="width: 3.698in; height: 2.4272in;" /></p>
+<div class="section" id="create-a-text-file">
+<h3>Create a text file<a class="headerlink" href="#create-a-text-file" title="Permalink to this headline">¶</a></h3>
+<p>Select “Text file” from the menu and enter the desired file name.</p>
+<p><img alt="1000000000000175000000FAB2A2B294_png" src="../_images/1000000000000175000000FAB2A2B294.png" style="width: 3.8846in; height: 2.6043in;" /></p>
+<p>Then press enter.</p>
+<p><img alt="100000000000047A000000FB86FF2A9A_png" src="../_images/100000000000047A000000FB86FF2A9A.png" style="width: 6.5in; height: 1.4228in;" /></p>
+<p>Notice the file has been placed in section 2 of the main ownCloud window.
+Since it is an empty file, the size is “0 Bytes” and it was last modified a few seconds ago.</p>
+</div>
+<div class="section" id="create-a-folder">
+<h3>Create a folder<a class="headerlink" href="#create-a-folder" title="Permalink to this headline">¶</a></h3>
+<p>To create a folder within ownCloud, simply select “Folder” from the menu and enter the desired folder name.</p>
+<p><img alt="1000000000000195000000EF7E44082C_png" src="../_images/1000000000000195000000EF7E44082C.png" style="width: 4.2189in; height: 2.4898in;" /></p>
+<p>Then select Enter.</p>
+<p>Notice the folder appears in the window.</p>
+<p><img alt="100000000000047A0000011C6682A254_png" src="../_images/100000000000047A0000011C6682A254.png" style="width: 6.5in; height: 1.611in;" /></p>
+</div>
+<div class="section" id="adding-a-file-from-a-link">
+<h3>Adding a file from a link<a class="headerlink" href="#adding-a-file-from-a-link" title="Permalink to this headline">¶</a></h3>
+<p>If the desired file exists on the internet already it is possible to add the file to ownCloud using the internet link.
+To do this, select “From link” from the menu and enter the URL of the file then select enter.</p>
+<p><img alt="10000000000001CE000000F2E2084BA1_png" src="../_images/10000000000001CE000000F2E2084BA1.png" style="width: 4.8126in; height: 2.5201in;" /></p>
+<p><img alt="100000000000046D0000015F4B5494A9_png" src="../_images/100000000000046D0000015F4B5494A9.png" style="width: 6.5in; height: 2.0138in;" /></p>
+<p>The file contained in the link now appears in the user’s ownCloud instance.</p>
+</div>
+</div>
+<div class="section" id="uploading-files">
+<h2>Uploading files<a class="headerlink" href="#uploading-files" title="Permalink to this headline">¶</a></h2>
+<p>There are two methods possible to upload files to the ownCloud web interface.</p>
+<div class="section" id="drag-and-drop">
+<h3>Drag and Drop<a class="headerlink" href="#drag-and-drop" title="Permalink to this headline">¶</a></h3>
+<p>Simply drag and drop one or more files from the client’s
+Desktop into section 2 of the main ownCloud window.
+These files will then be uploaded to ownCloud and appear in the data window.</p>
+</div>
+<div class="section" id="upload-button">
+<h3>Upload Button<a class="headerlink" href="#upload-button" title="Permalink to this headline">¶</a></h3>
+<p>The second method to upload a file to ownCloud is to select the upload arrow on the top left of the main ownCloud screen.
+This will being up a File Upload selection box.</p>
+<p><img alt="100000000000048100000245268CDB7A_png" src="../_images/100000000000048100000245268CDB7A.png" style="width: 6.5in; height: 3.2756in;" /></p>
+<p>Navigate to the directory containing the desired files and select the file for uploading and press Open.
+To upload multiple files simultaneously, use either the SHIFT or CTRL key during file selection as appropriate.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Initial_Log_In.html
index c0ced61,0000000..1eb8484
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Initial_Log_In.html
+++ b/core/doc/admin/web_guide/Initial_Log_In.html
@@@ -1,154 -1,0 +1,154 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Initial Log In — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="initial-log-in">
+<h1>Initial Log In<a class="headerlink" href="#initial-log-in" title="Permalink to this headline">¶</a></h1>
+<p>The ownCloud initial login screen is as follows.</p>
+<p><img alt="1000000000000453000001BFFCF48776_png" src="../_images/1000000000000453000001BFFCF48776.png" style="width: 6.5in; height: 2.6252in;" /></p>
+<p>It should be noted, that if the instance of ownCloud is themed differently, there will be a different logo on the screen.</p>
+<p>To log into ownCloud, enter the username and password provided by your ownCloud admin.
+To remain logged into ownCloud under the same credentials, select the checkbox next to Remember.</p>
+<p>Upon initial login, the user will most likely see the “Welcome to ownCloud” banner as below.</p>
+<p><img alt="1000000000000479000002887E7F48EA_png" src="../_images/1000000000000479000002887E7F48EA.png" style="width: 6.5in; height: 3.6783in;" /></p>
+<p>This banner provides links to download the desktop sync app (see Desktop Client document), as well as the mobile apps.
+This banner will appear upon the first login only, provided the admin has not disabled it.
+To close the banner and start using ownCloud, select the ‘x’ in the upper right corner of the banner.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Introduction.html
index 1aeea43,0000000..a72d575
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Introduction.html
+++ b/core/doc/admin/web_guide/Introduction.html
@@@ -1,147 -1,0 +1,147 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Introduction — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="introduction">
+<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
+<p>This document will discuss the ownCloud web interface from a user’s perspective.
+It will detail how to log into ownCloud, upload files, create files and folders, as well as describe the Personal Page settings.
+When possible, it will reference other more detailed documents on specific functionality.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Main_ownCloud_screen.html
index ffa791a,0000000..01b56a3
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Main_ownCloud_screen.html
+++ b/core/doc/admin/web_guide/Main_ownCloud_screen.html
@@@ -1,156 -1,0 +1,156 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Main ownCloud screen — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="main-owncloud-screen">
+<h1>Main ownCloud screen<a class="headerlink" href="#main-owncloud-screen" title="Permalink to this headline">¶</a></h1>
+<p>Once logged into ownCloud, the main screen will be displayed.</p>
+<p><img alt="100000000000047700000219A3013A92_png" src="../_images/100000000000047700000219A3013A92.png" style="width: 6.5in; height: 3.0535in;" /></p>
+<p>There are four sections in the main ownCloud screen</p>
+<ol class="arabic simple">
+<li>This is the apps bar.
+Any user related apps will be displayed here.
+In a default enterprise edition of ownCloud, the Files app and the Activity app are listed.</li>
+<li>This section will display all data loaded into ownCloud.</li>
+<li>The home button brings the user to the home directory.
+The New button allows the user to create a file or folder, or link, and the upload arrow allows the user to upload a file.</li>
+<li>The search box allows the user to search and the user name pull-down can bring the user to the Personal page for personal configurations as well as log the user out.</li>
+</ol>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Navigation.html
index ceefbdb,0000000..39a8fa8
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Navigation.html
+++ b/core/doc/admin/web_guide/Navigation.html
@@@ -1,178 -1,0 +1,178 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Navigation — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="navigation">
+<h1>Navigation<a class="headerlink" href="#navigation" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="changing-directories">
+<h2>Changing directories<a class="headerlink" href="#changing-directories" title="Permalink to this headline">¶</a></h2>
+<p>To navigate to other folders within ownCloud, simply click on the desired folder.</p>
+<p><img alt="1000000000000470000001B68AE60DD3_png" src="../_images/1000000000000470000001B68AE60DD3.png" style="width: 6.5in; height: 2.5063in;" /></p>
+<p>Notice that Section 3 shows the currently displayed directory “my_folder”.
+To navigate back to the root directly, select the “Home” button.</p>
+</div>
+<div class="section" id="viewing-editing-files">
+<h2>Viewing/Editing files<a class="headerlink" href="#viewing-editing-files" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud has the ability to view text files as well as pictures.
+To view a text file or a picture, click on the file.</p>
+<p><img alt="10000000000004710000014BBC34499D_png" src="../_images/10000000000004710000014BBC34499D.png" style="width: 6.5in; height: 1.8925in;" /></p>
+<p>For text files, a text editor will be brought up allowing the user to modify the file as desired.
+Just type the desired text and select “Save” to commit the changes.
+Once changes have been made to the file, prior to saving, the name of the file will have an “*” next to it indicating it has yet to be saved.</p>
+<p><img alt="100000000000046F000000DEA2BFCD9B_png" src="../_images/100000000000046F000000DEA2BFCD9B.png" style="width: 6.5in; height: 1.2717in;" /></p>
+<p>Once changes have been saved, a thumbnail of the text file will appear in the main data window.</p>
+<p><img alt="100000000000041D0000003D52225C0D_png" src="../_images/100000000000041D0000003D52225C0D.png" style="width: 6.5in; height: 0.3764in;" /></p>
+</div>
+<div class="section" id="downloading-a-file">
+<h2>Downloading a file<a class="headerlink" href="#downloading-a-file" title="Permalink to this headline">¶</a></h2>
+<p>To download a file from ownCloud to your working computer, hover over the file and then select the “Download” button.</p>
+<p><img alt="100000000000047200000129CB014025_png" src="../_images/100000000000047200000129CB014025.png" style="width: 6.5in; height: 1.6965in;" /></p>
+<p>For non-text or picture files, the user may also click on the file name to download it.</p>
+</div>
+<div class="section" id="renaming-files-or-folders">
+<h2>Renaming files or Folders<a class="headerlink" href="#renaming-files-or-folders" title="Permalink to this headline">¶</a></h2>
+<p>To rename a file or folder within ownCloud, hover over the file and select Rename.
+Then type the new name of the file or folder.</p>
+</div>
+<div class="section" id="sharing-versions-delete-and-activity">
+<h2>Sharing, Versions, Delete, and Activity<a class="headerlink" href="#sharing-versions-delete-and-activity" title="Permalink to this headline">¶</a></h2>
+<p>For more information on the sharing, versions, deletion or Activity features, please see the respective documents.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Personal_Configurations.html
index b71ecee,0000000..6e1e3cf
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Personal_Configurations.html
+++ b/core/doc/admin/web_guide/Personal_Configurations.html
@@@ -1,193 -1,0 +1,193 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Personal Configurations — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="personal-configurations">
+<h1>Personal Configurations<a class="headerlink" href="#personal-configurations" title="Permalink to this headline">¶</a></h1>
+<p>Each ownCloud user may configure some personal preferences.
+To make these configurations, navigate to the Personal page.
+Select the user name and the following menu will appear.</p>
+<p><img alt="100000000000047A000000B727198874_png" src="../_images/100000000000047A000000B727198874.png" style="width: 6.5in; height: 1.0382in;" /></p>
+<p>Select Personal to get to the configuration page.</p>
+<p>Configuration options on this page may appear or disappear depending on what the ownCloud admin has configured.
+The basic configuration parameters are as follows.</p>
+<p><img alt="1000000000000467000002B63162E59B_png" src="../_images/1000000000000467000002B63162E59B.png" style="width: 6.5in; height: 4.0028in;" /></p>
+<p><img alt="10000000000004690000026615360BEB_png" src="../_images/10000000000004690000026615360BEB.png" style="width: 6.5in; height: 3.5346in;" /></p>
+<div class="section" id="important-links">
+<h2>Important links<a class="headerlink" href="#important-links" title="Permalink to this headline">¶</a></h2>
+<p>The top section of the Personal page contains the same links as the First Run Wizard described earlier in this document.
+For more information on this, see the document on the First Run Wizard.</p>
+</div>
+<div class="section" id="quota">
+<h2>Quota<a class="headerlink" href="#quota" title="Permalink to this headline">¶</a></h2>
+<p>Below shows the used and remaining space for the user.
+For information as to how this is calculated, refer to the ownCloud Quota Calculations document.</p>
+</div>
+<div class="section" id="password-change">
+<h2>Password Change<a class="headerlink" href="#password-change" title="Permalink to this headline">¶</a></h2>
+<p>If the user desires to change the password, do so in this section.
+Enter the current password followed by the new password and select “Change Password”.
+It should be noted, that when using LDAP authentication, the password is contained within the LDAP and not locally thus this field will not change the password.</p>
+</div>
+<div class="section" id="change-display-name">
+<h2>Change Display Name<a class="headerlink" href="#change-display-name" title="Permalink to this headline">¶</a></h2>
+<p>To change the way your name is displayed within ownCloud, enter the desired name under “Full Name”.</p>
+</div>
+<div class="section" id="add-email-address">
+<h2>Add Email Address<a class="headerlink" href="#add-email-address" title="Permalink to this headline">¶</a></h2>
+<p>For password recovery and share notifications, it is important for ownCloud to have an email on record.
+Enter the desired email address under the EMAIL section.</p>
+</div>
+<div class="section" id="avatar">
+<h2>Avatar<a class="headerlink" href="#avatar" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud allows a user to upload an Avatar for their ownCloud instance.
+This can be done under the “Profile Picture” section of the Personal Page.</p>
+<p>To upload a new Avatar, select the “Upload new” button.
+If the desired avatar exists on the ownCloud file system, select “Select new from Files” and to remove the avatar and return to the default, select “Remove image”</p>
+</div>
+<div class="section" id="language">
+<h2>Language<a class="headerlink" href="#language" title="Permalink to this headline">¶</a></h2>
+<p>If English is not the user’s native language, they may change the language in this section.</p>
+</div>
+<div class="section" id="webdav">
+<h2>WebDAV<a class="headerlink" href="#webdav" title="Permalink to this headline">¶</a></h2>
+<p>This provides the address to use in order to access a user’s files via WebDav.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/Table_of_Contents.html
index d8c07b2,0000000..1c93cde
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/Table_of_Contents.html
+++ b/core/doc/admin/web_guide/Table_of_Contents.html
@@@ -1,145 -1,0 +1,145 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Table of Contents — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">¶</a></h1>
+<p>` <#_Toc375905226>`_</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/admin/web_guide/index.html
index 4c956b6,0000000..c211ab4
mode 100644,000000..100644
--- a/core/doc/admin/web_guide/index.html
+++ b/core/doc/admin/web_guide/index.html
@@@ -1,174 -1,0 +1,174 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title><no title> — ownCloud Administrators Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud Administrators Manual 6.0 documentation" href="../index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud Administrators Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">Admin Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 Admin Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/index.html">Installation</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../configuration/index.html">Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../maintenance/index.html">Maintenance</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../issues/index.html">Issues</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <p><strong>ownCloud Web Interface Users Guide</strong></p>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="Table_of_Contents.html">Table of Contents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Initial_Log_In.html">Initial Log In</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Main_ownCloud_screen.html">Main ownCloud screen</a></li>
+<li class="toctree-l1"><a class="reference internal" href="Adding_Data.html">Adding Data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Adding_Data.html#creation">Creation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Adding_Data.html#uploading-files">Uploading files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Navigation.html">Navigation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Navigation.html#changing-directories">Changing directories</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Navigation.html#viewing-editing-files">Viewing/Editing files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Navigation.html#downloading-a-file">Downloading a file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Navigation.html#renaming-files-or-folders">Renaming files or Folders</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Navigation.html#sharing-versions-delete-and-activity">Sharing, Versions, Delete, and Activity</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="Personal_Configurations.html">Personal Configurations</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#important-links">Important links</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#quota">Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#password-change">Password Change</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#change-display-name">Change Display Name</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#add-email-address">Add Email Address</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#avatar">Avatar</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#language">Language</a></li>
+<li class="toctree-l2"><a class="reference internal" href="Personal_Configurations.html#webdav">WebDAV</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/_sources/index.txt
index a0c2cb2,0000000..d3365d1
mode 100644,000000..100644
--- a/core/doc/user/_sources/index.txt
+++ b/core/doc/user/_sources/index.txt
@@@ -1,71 -1,0 +1,72 @@@
+.. _index:
+
- ==================
- User Documentation
- ==================
++=====================================
++ownCloud |version| User Documentation
++=====================================
++
+**Welcome to ownCloud, your self-hosted file sync and share solution.**
+
+ownCloud is open source file sync and share software for everyone from individuals operating the free Community Edition, to large enterprises and service providers operating ownCloud Enterprise Edition. ownCloud provides a safe, secure and compliant file sync and share solution on servers you control.
+
+With ownCloud you can share one or more folders on your PC, and sync them with your ownCloud server. Place files in your local shared directories, and those files are immediately synced to the server, and then to other PCs via the desktop client. Not near a desktop client? No problem, simply log in with the web client and manage your files there. The Android and iOS mobile apps allow you to browse, download and upload photos and videos. On Android, you may also create, download, edit an [...]
+
+Whether using a mobile device, a workstation, or a web client, ownCloud provides the ability to put the right files in the right hands at the right time on any device in one simple-to-use, secure, private and controlled solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
+
+Web interface
+=============
+This chapter contains a general overview how you access ownCloud from a Browser like Firefox, Chrome or Internet Explorer
+
+* :doc:`webinterface`
+
+Files & Synchronization
+=======================
+This chapter contains information about accessing your files via WebDAV and Synchronization.
+
+* :doc:`files/filesweb`
+* :doc:`files/files`
+* :doc:`files/sync`
+* :doc:`files/versioncontrol`
+* :doc:`files/deletedfiles`
+* :doc:`files/encryption`
+* :doc:`files/quota`
+* :doc:`files/configuring_big_file_upload`
+
+
+Contacts & Calendar
+===================
+Contacts & Calendar web interface, export, import and synchronization.
+
+* :doc:`pim/calendar`
+* :doc:`pim/contacts`
+* :doc:`pim/sync_ios`
+* :doc:`pim/sync_kde`
+* :doc:`pim/sync_osx`
+
+Documents
+=========
+Documents allows users collaboratively edit rich-text documents at the same time.
+
+* :doc:`documents`
+
+Bookmarks
+=========
+Web interface for managing your bookmarks.
+
+* :doc:`bookmarks`
+
+Backup
+======
+Import and export your user account settings.
+
+* :doc:`migration`
+
+External storage
+================
+Mount external storages into ownCloud.
+
+* :doc:`external_storage/google_drive`
+
+Indices and tables
+==================
+
+* :ref:`genindex`
diff --cc core/doc/user/bookmarks.html
index add4060,0000000..485e90e
mode 100644,000000..100644
--- a/core/doc/user/bookmarks.html
+++ b/core/doc/user/bookmarks.html
@@@ -1,207 -1,0 +1,207 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Using the Bookmarks App — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <link rel="next" title="Documents" href="documents.html" />
+ <link rel="prev" title="Troubleshooting" href="pim/troubleshooting.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Using the Bookmarks App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#add-a-bookmark">Add a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#edit-delete-a-bookmark">Edit/Delete a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#search">Search</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#the-bookmarklet">The Bookmarklet</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="using-the-bookmarks-app">
+<h1>Using the Bookmarks App<a class="headerlink" href="#using-the-bookmarks-app" title="Permalink to this headline">¶</a></h1>
+<p>If you want to add a bookmark to the Bookmarks application,
+you can either use the main interface or the bookmarklet.</p>
+<div class="section" id="the-main-interface">
+<h2>The main interface<a class="headerlink" href="#the-main-interface" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="add-a-bookmark">
+<h3>Add a bookmark<a class="headerlink" href="#add-a-bookmark" title="Permalink to this headline">¶</a></h3>
+<p>In the bookmark application, enter a URL into the top-left area of the content section. After adding an address, click on the pencil button to edit fields for the given address.
+The main ownCloud bookmark interface contains 3 fields at the top where
+you can enter the website address (or URL), the title of your bookmark, and
+a set of tags separated from each other by a space.</p>
+<div class="figure">
+<img alt="_images/bookmark_addurl.png" src="_images/bookmark_addurl.png" />
+</div>
+<p>Adding a bookmark manually</p>
+<p>In this example, we have added the page <cite>http://wikipedia.org</cite> with the title “Wikipedia”
+and some tags describing what Wikipedia is for an easier search later on.</p>
+</div>
+<div class="section" id="edit-delete-a-bookmark">
+<h3>Edit/Delete a bookmark<a class="headerlink" href="#edit-delete-a-bookmark" title="Permalink to this headline">¶</a></h3>
+<p>You also have the possibility to edit or delete a bookmark.</p>
+<p>To edit a bookmark, hover over the bookmark and click on the pencil icon.
+The bookmark details will then be filled into the 3 fields at the top of the screen.
+Modify your bookmark to your needs then click the save button to persist the change.</p>
+<p>To delete a bookmark, hover over the bookmark and click the cross icon.</p>
+</div>
+<div class="section" id="search">
+<h3>Search<a class="headerlink" href="#search" title="Permalink to this headline">¶</a></h3>
+<p>If you click on a tag, ownCloud will only display the bookmarks that
+are described with this tag.</p>
+<p>You can also use the search bar of ownCloud in the top right of your screen.</p>
+<p>Simply click on the “Bookmarks” menu in the sidebar to come back to
+the default view.</p>
+</div>
+</div>
+<div class="section" id="the-bookmarklet">
+<h2>The Bookmarklet<a class="headerlink" href="#the-bookmarklet" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="_images/bookmark_setting.png" src="_images/bookmark_setting.png" />
+</div>
+<p>Bookmarklet link</p>
+<p>The creator of this app understands that people won’t want to
+open the ownCloud boorkmarks page to add a bookmark every time they see a cool site.
+This is why they have made this cool “bookmarklet”.</p>
+<p>A bookmarklet is small button that you can drag and drop in your bookmarks.
+The next time you see a cool new site, click on this special bookmark
+to add the site to your ownCloud bookmarks.</p>
+<p>To find this bookmark, click on the gear button at the bottom of the bookmarks app.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/contents.html
index b3216ea,0000000..a74071b
mode 100644,000000..100644
--- a/core/doc/user/contents.html
+++ b/core/doc/user/contents.html
@@@ -1,266 -1,0 +1,266 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>ownCloud documentation contents — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
- <link rel="next" title="User Documentation" href="index.html" />
++ <link rel="next" title="ownCloud 6.0 User Documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="#">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="#">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="owncloud-documentation-contents">
+<span id="contents"></span><h1>ownCloud documentation contents<a class="headerlink" href="#owncloud-documentation-contents" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+</div>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="webinterface.html#overview">Overview</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="files/filesweb.html">Accessing your Files (Web Interface)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#navigating-inside-your-owncloud">Navigating inside your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#creating-uploading-files">Creating/uploading files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#selecting-files">Selecting files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#viewing-files">Viewing files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#moving-files">Moving files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/filesweb.html#sharing-files">Sharing files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/files.html">Accessing your Files (WebDAV)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#linux">Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#macos">MacOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#windows">Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#sync-client">Sync Client</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/files.html#mobile">Mobile</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files/encryption.html">Files Encryption</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#what-gets-encrypted">What gets encrypted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#decrypt-your-data-again">Decrypt your data again</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/encryption.html#settings">Settings</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/quota.html">Storage Quota</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="files/quota.html#checking-the-available-space">Checking the available space</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/quota.html#sharing">Sharing</a></li>
+<li class="toctree-l3"><a class="reference internal" href="files/quota.html#excluded-from-quota">Excluded from quota</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files/configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="pim/contacts.html">Using the Contacts App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#adding-contacts">Adding contacts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#creating-new-addressbooks">Creating new addressbooks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#keeping-your-addressbook-in-sync">Keeping your addressbook in sync</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/contacts.html#it-doesn-t-work">It doesn’t work!!!</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/calendar.html">Using the Calendar App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-a-calendar">Creating a calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#synchronising-calendars-with-caldav">Synchronising Calendars with CalDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#creating-events">Creating events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#exporting-importing-events">Exporting / Importing events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/calendar.html#why-is-the-calendar-app-asking-for-my-current-location">Why is the calendar app asking for my current location?</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_ios.html">iOS - Synchronize iPhone/iPad</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#calendar">Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_ios.html#address-book">Address book</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_osx.html">Synchronizing with OS X</a></li>
+<li class="toctree-l2"><a class="reference internal" href="pim/sync_thunderbird.html">Thunderbird - Synchronize Addressbook</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="pim/sync_thunderbird.html#addressbook">Addressbook</a></li>
+</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#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="pim/troubleshooting.html#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#add-a-bookmark">Add a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#edit-delete-a-bookmark">Edit/Delete a bookmark</a></li>
+<li class="toctree-l3"><a class="reference internal" href="bookmarks.html#search">Search</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="bookmarks.html#the-bookmarklet">The Bookmarklet</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="documents.html#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#create-upload-a-document">Create/Upload a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#edit-a-document">Edit a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#delete-a-document">Delete a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="documents.html#share-a-document">Share a Document</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="migration.html#export">Export</a></li>
+<li class="toctree-l2"><a class="reference internal" href="migration.html#import">Import</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="external_storage/google_drive.html#google-drive">Google Drive</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="indices-and-tables">
+<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/documents.html
index 93a9aac,0000000..e295c2c
mode 100644,000000..100644
--- a/core/doc/user/documents.html
+++ b/core/doc/user/documents.html
@@@ -1,216 -1,0 +1,216 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Documents — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <link rel="next" title="User Account Migration" href="migration.html" />
+ <link rel="prev" title="Using the Bookmarks App" href="bookmarks.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Documents</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#the-main-interface">The main interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#create-upload-a-document">Create/Upload a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#edit-a-document">Edit a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#delete-a-document">Delete a Document</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#share-a-document">Share a Document</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="documents">
+<h1>Documents<a class="headerlink" href="#documents" title="Permalink to this headline">¶</a></h1>
+<p>Document editing is one of the new features in ownCloud 6. With this app, multiple users
+can edit rich-text simultaneously. The documents can be created from within the
+web-interface or existing documents can be uploaded. Sharing and editing can be done
+securely in the browser and be shared inside ownCloud or via a public link. User that
+have an account on the same server can be invited or public invitations can also be
+sent be email. The editing works on top of normal ODF files that are stored in ownCloud.</p>
+<div class="section" id="the-main-interface">
+<h2>The main interface<a class="headerlink" href="#the-main-interface" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="_images/oc_documents.png" src="_images/oc_documents.png" />
+</div>
+<div class="section" id="create-upload-a-document">
+<h3>Create/Upload a Document<a class="headerlink" href="#create-upload-a-document" title="Permalink to this headline">¶</a></h3>
+<p>In the documents application, click on the respective buttons to create or upload a document into your ownCloud. The <em>New document</em> button will create a document named “New document.odt”. The extension ODT is an OpenDocument format, which many major office applications let you create/edit/view.</p>
+<p>The <em>Upload</em> button allows you to upload any kind of document, but currently you can only edit ODT files within ownCloud.</p>
+</div>
+<div class="section" id="edit-a-document">
+<h3>Edit a Document<a class="headerlink" href="#edit-a-document" title="Permalink to this headline">¶</a></h3>
+<p>If ownCloud contains at least one ODT file, you can immediately start editing by clicking on
+the file within the documents app. Clicking on documents in files app will only display it. Below, you
+can see editing a newly created document file:</p>
+<div class="figure">
+<img alt="_images/oc_documents_edit.png" src="_images/oc_documents_edit.png" />
+</div>
+<p>Here is the explanation of each field in the image shown above:</p>
+<ol class="arabic simple">
+<li>Clicking on the file name allows you to change filename.</li>
+<li>Allows you to share the document to public, specific users or groups. Will be explained in detail in <a class="reference internal" href="#share-a-document"><em>Share a document</em></a> section.</li>
+<li>Formatting toolbar lets you change text styles.</li>
+<li>Zoom in/out</li>
+<li>Close document by saving changes</li>
+<li>Users currently editing this document</li>
+</ol>
+<div class="section" id="collaboratively-editing-a-document">
+<h4>Collaboratively Editing a Document<a class="headerlink" href="#collaboratively-editing-a-document" title="Permalink to this headline">¶</a></h4>
+<p>To edit a file collaboratively, it needs to be shared with at least one user by using the <em>Share</em> button. When multiple uses have permission to edit a document, they will be able to edit it at the same time. The cursor of all editing users will be the same color as the border color of their user picture.</p>
+<div class="figure">
+<img alt="_images/oc_documents_col_edit.png" src="_images/oc_documents_col_edit.png" />
+</div>
+<p>If a user is not a local user (e.g accessing the file using public link), he/she will be shown as guest in user list and they will type a nickname before editing.</p>
+</div>
+</div>
+<div class="section" id="delete-a-document">
+<h3>Delete a Document<a class="headerlink" href="#delete-a-document" title="Permalink to this headline">¶</a></h3>
+<p>A document can be deleted using the files app and following the same procedure as for other file types. Clicking on the cross icon deletes the selected document.</p>
+</div>
+<div class="section" id="share-a-document">
+<span id="id1"></span><h3>Share a Document<a class="headerlink" href="#share-a-document" title="Permalink to this headline">¶</a></h3>
+<p>Document sharing has the same options as when sharing other files. While editing a document, you can use the <em>Share</em> button to enable other users to edit the document. This button will display all available options to share:</p>
+<div class="figure">
+<img alt="_images/oc_documents_share.png" src="_images/oc_documents_share.png" />
+</div>
+<p>By default, you can enter local users or groups to share with. Checking <em>Share link</em> will enable sharing via a public link, for which you can set a password to prevent editing by unwanted users. Shares can also have an expiration date that will expire the link after a given date. ownCloud will send the public link to users by email by typing each email address into the email field. Separate multiple email addresses with a space.</p>
+<p>To see all of the features of the ownCloud document app, watch the
+<a class="reference external" href="https://www.youtube.com/watch?v=70pCBnNPdew">video on YouTube</a>.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/external_storage/google_drive.html
index 95835b1,0000000..17f1de4
mode 100644,000000..100644
--- a/core/doc/user/external_storage/google_drive.html
+++ b/core/doc/user/external_storage/google_drive.html
@@@ -1,206 -1,0 +1,206 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>External storage — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="prev" title="Changing Preferences" href="../userpreferences.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">External storage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#google-drive">Google Drive</a></li>
+</ul>
+</li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="external-storage">
+<h1>External storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="google-drive">
+<h2>Google Drive<a class="headerlink" href="#google-drive" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic">
+<li><p class="first">All applications that access a Google API must be registered through the “Google Cloud Console” which can be accessed using the following URL:</p>
+<div class="highlight-python"><pre>https://cloud.google.com/console</pre>
+</div>
+</li>
+<li><p class="first">Enter your Google login credentials and press the <tt class="docutils literal"><span class="pre">Sign</span> <span class="pre">in</span></tt> button.</p>
+<img alt="../_images/external_google_drive_1_sign_in.png" src="../_images/external_google_drive_1_sign_in.png" />
+</li>
+<li><p class="first">Enter your verification code which has been sent to you by SMS or the Authenticator App and press the <tt class="docutils literal"><span class="pre">Verify</span></tt> button.</p>
+<img alt="../_images/external_google_drive_2_verify.png" src="../_images/external_google_drive_2_verify.png" />
+</li>
+<li><p class="first">Create a project, e.g. “ownCloud-Project”</p>
+<img alt="../_images/external_google_drive_3_create_project.png" src="../_images/external_google_drive_3_create_project.png" />
+</li>
+<li><p class="first">Select the project and choose the “APIs & auth” menu entry.</p>
+</li>
+<li><p class="first">Make sure that the “Drive API” and “Drive SDK” status is set to “ON” in the APIs menu.</p>
+<img alt="../_images/external_google_drive_4_enable_api.png" src="../_images/external_google_drive_4_enable_api.png" />
+</li>
+<li><p class="first">Click on the <tt class="docutils literal"><span class="pre">gear-wheel</span></tt> button behind “Drive API” or “Drive SDK” and choose the “API access” menu entry.</p>
+</li>
+<li><p class="first">Click on the <tt class="docutils literal"><span class="pre">Create</span> <span class="pre">another</span> <span class="pre">client</span> <span class="pre">ID...</span></tt> button and fill in the branding information.</p>
+</li>
+<li><p class="first">Click on the <tt class="docutils literal"><span class="pre">Next</span></tt> button and create a new client ID by selecting “Web application” as application type.</p>
+</li>
+<li><p class="first">Next to your site or hostname click on the <tt class="docutils literal"><span class="pre">Edit</span> <span class="pre">settings</span> <span class="pre">...</span></tt> button.</p>
+</li>
+<li><p class="first">Enter the following URLs to the “Authorized Redirect URIs” list and press the Update-button.</p>
+</li>
+</ol>
+<div class="highlight-python"><pre>https://your-internet-domain/owncloud/index.php/settings/personal
+https://your-internet-domain/owncloud/index.php/settings/admin</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last"><strong>Attention:</strong> Make sure that the URLs contain a valid internet domain name and that this domain name is also used to access ownCloud, otherwise these URLs will not be accepted. This does not mean that ownCloud need to be accessible from the Internet, but that the domain name is send to Google to verify if the redirect URIs are valid.</p>
+</div>
+<ol class="arabic" start="12">
+<li><p class="first">Login into ownCloud using the previously entered Internet domain.</p>
+</li>
+<li><p class="first">Click on the <tt class="docutils literal"><span class="pre">Add</span> <span class="pre">storage</span></tt> button in the ownCloud Admin or Personal settings dialog to add a Google Drive.</p>
+</li>
+<li><p class="first">Enter the folder name which should be used to access the share, e.g. “GDrive”, enter the Google OAuth 2.0 <strong>Client ID</strong> and <strong>Client secret</strong>. Additional for the admin settings you have to choose the <strong>user and/or group</strong> who/which should be allowed to access the Google Drive (Applicable).</p>
+<img alt="../_images/external_google_drive_5_setup_ownCloud.png" src="../_images/external_google_drive_5_setup_ownCloud.png" />
+</li>
+<li><p class="first">Now press the <tt class="docutils literal"><span class="pre">Grant</span> <span class="pre">Access</span></tt> button and you will finally be redirected to a Google website.</p>
+</li>
+<li><p class="first">Click on the <tt class="docutils literal"><span class="pre">Accept</span></tt> button to confirm that you accept the Google data usage and data security policy.</p>
+<img alt="../_images/external_google_drive_6_accept.png" src="../_images/external_google_drive_6_accept.png" />
+</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/configuring_big_file_upload.html
index d792daa,0000000..e471035
mode 100644,000000..100644
--- a/core/doc/user/files/configuring_big_file_upload.html
+++ b/core/doc/user/files/configuring_big_file_upload.html
@@@ -1,169 -1,0 +1,169 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Big Files — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Contacts & Calendar" href="../pim/index.html" />
+ <link rel="prev" title="Storage Quota" href="quota.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="big-files">
+<h1>Big Files<a class="headerlink" href="#big-files" title="Permalink to this headline">¶</a></h1>
+<p>There are a few default configuration settings that you will want to change to enable ownCloud to operate
+more effectively as a self hosted file sync and share server.
+When uploading through the web client, ownCloud is governed by PHP and Apache.
+As a default, PHP is configured for only 2 MB uploads.
+This is not entirely useful, so it is important to increase these variables to the sizes you want to
+support on your server.
+Ask your administrator to increase these variables for you or read the section in concern <a class="reference external" href="http://doc.owncloud.org/server/6.0/admin_manual/configuration/configuring_big_file_upload.html">within the
+Admin Documentation</a>.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/deletedfiles.html
index 4015f9e,0000000..91e94b7
mode 100644,000000..100644
--- a/core/doc/user/files/deletedfiles.html
+++ b/core/doc/user/files/deletedfiles.html
@@@ -1,177 -1,0 +1,177 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Deleted Files — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Desktop Synchronization" href="sync.html" />
+ <link rel="prev" title="Version Control" href="versioncontrol.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="deleted-files">
+<h1>Deleted Files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud keeps a copy of your deleted files in case you need them again. To
+make sure that the user doesn’t run out of memory, the deleted files app
+manages the size of the deleted files for the user. The app takes care to never
+use more that 50% of your currently available free space. If your deleted files
+exceed this limit, ownCloud deletes the oldest versions until it meets the memory
+usage limit again.</p>
+<p>Deleted files can be found by clicking on the <em>Deleted files</em> button on files app of web interface.
+You can either restore or permanently delete using appropriate buttons.</p>
+<p>ownCloud also checks the age of deleted files every time new files are added
+to the deleted files. By default, deleted files stay in the trash bin for 180 days.
+The Administrator can adjust this value in the config.php by setting the
+<strong>*”trashbin_retention_obligation”*</strong> value. Files older than the
+<strong>*”trashbin_retention_obligation”*</strong> will be deleted permanently.
+Additionally, ownCloud calculates the maximum available space every time
+a new file is added. If the deleted files exceed the new maximum allowed space
+ownCloud will expire old deleted files until the limit is met once again.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/encryption.html
index 0f12666,0000000..c468f71
mode 100644,000000..100644
--- a/core/doc/user/files/encryption.html
+++ b/core/doc/user/files/encryption.html
@@@ -1,220 -1,0 +1,220 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Files Encryption — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Storage Quota" href="quota.html" />
+ <link rel="prev" title="Desktop Synchronization" href="sync.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Files Encryption</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#what-gets-encrypted">What gets encrypted</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#decrypt-your-data-again">Decrypt your data again</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#settings">Settings</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="files-encryption">
+<h1>Files Encryption<a class="headerlink" href="#files-encryption" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud ships a encryption app, which allows to encrypt all files stored in
+your ownCloud. Once the encryption app was enabled by the admin all your files
+will be encrypted automatically. Encryption and decryption always happens
+server-side. This enables the user to continue to use all the other apps to
+view and edit his data. But this also means that the server administrator could
+intercept your data. Server-Side encryption is especially interesting if you
+use external storages. This way you can make sure that the storage provider is
+not able to read your data.</p>
+<p>Please remember. Once the encryption app is enabled you need your log-in
+password to decrypt and access your data. By default your data will be lost if
+you loss your log-in password. If you want to protect yourself against password
+loss store your log-in password on a secure place or enable the recovery key
+as described below.</p>
+<div class="section" id="what-gets-encrypted">
+<h2>What gets encrypted<a class="headerlink" href="#what-gets-encrypted" title="Permalink to this headline">¶</a></h2>
+<p>The current version encrypts all your files stored in ownCloud.</p>
+<p>At the moment we don’t encrypt:</p>
+<ul class="simple">
+<li>old files in the trash bin (files which were deleted before the encryption app was enabled)</li>
+<li>image thumbnails from the gallery app and previews from the files app</li>
+<li>search index from the full text search app</li>
+</ul>
+<p>All this data is stored directly on your ownCloud server, so you don’t have to worry to expose
+your data to a third party storage provider.</p>
+</div>
+<div class="section" id="decrypt-your-data-again">
+<h2>Decrypt your data again<a class="headerlink" href="#decrypt-your-data-again" title="Permalink to this headline">¶</a></h2>
+<p>If the encryption app was disabled users can decrypt their files again in their
+personal settings. After this was done they can continue to use their ownCloud
+without encryption.</p>
+</div>
+<div class="section" id="settings">
+<h2>Settings<a class="headerlink" href="#settings" title="Permalink to this headline">¶</a></h2>
+<p>Once the encryption app is enabled you will find some additional settings on
+your personal settings page.</p>
+<div class="section" id="recovery-key">
+<h3>Recovery Key<a class="headerlink" href="#recovery-key" title="Permalink to this headline">¶</a></h3>
+<p>If the admin enabled the recovery-key you can decide by your own if you
+want to use this feature for your account. If you enable “Password recovery”
+the admin will be able to read your data with a special password. This allows
+him to recover your files in case of password loss. If the recovery-key is not
+enabled than there is no way to restore your files if you loss your log-in
+password.</p>
+</div>
+<div class="section" id="change-private-key-password">
+<h3>Change Private Key Password<a class="headerlink" href="#change-private-key-password" title="Permalink to this headline">¶</a></h3>
+<p>This option will be only available if your log-in password but not your
+encryption password was changed by your admin. This can happen if your ownCloud
+provider uses a external user back-end, e.g. LDAP, and changed your log-in
+password there. In this case you can set your encryption password to your new
+log-in password by providing your old and new log-in password. The encryption
+app only works if log-in password and encryption password is identical.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/files.html
index a6b48cd,0000000..5cca451
mode 100644,000000..100644
--- a/core/doc/user/files/files.html
+++ b/core/doc/user/files/files.html
@@@ -1,388 -1,0 +1,388 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Accessing your Files (WebDAV) — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Version Control" href="versioncontrol.html" />
+ <link rel="prev" title="Accessing your Files (Web Interface)" href="filesweb.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Accessing your Files (WebDAV)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#linux">Linux</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#macos">MacOS</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#windows">Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sync-client">Sync Client</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#mobile">Mobile</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="accessing-your-files-webdav">
+<h1>Accessing your Files (WebDAV)<a class="headerlink" href="#accessing-your-files-webdav" title="Permalink to this headline">¶</a></h1>
+<p>Your ownCloud instance can be accessed on every platform via the web interface. There are also options to integrate it with your desktop.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">You will have to adjust <strong>example.org/</strong> to the URL of your ownCloud server installation</p>
+</div>
+<div class="section" id="linux">
+<h2>Linux<a class="headerlink" href="#linux" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="gnome-3-nautilus">
+<h3>Gnome 3/Nautilus<a class="headerlink" href="#gnome-3-nautilus" title="Permalink to this headline">¶</a></h3>
+<p>The URL that you have to use to connect to the ownCloud installation in nautilus is:</p>
+<div class="highlight-python"><pre>davs://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/gnome3_nautilus_webdav.png" src="../_images/gnome3_nautilus_webdav.png" />
+<p>If your server connection is not HTTPS-secured, use <cite>dav://</cite> instead of <cite>davs://</cite> .</p>
+</div>
+<div class="section" id="kde-dolphin">
+<h3>KDE/Dolphin<a class="headerlink" href="#kde-dolphin" title="Permalink to this headline">¶</a></h3>
+<p>Click in the address area and enter:</p>
+<div class="highlight-python"><pre>webdav://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/dolphin_webdav.png" src="../_images/dolphin_webdav.png" />
+<p>or:</p>
+<ol class="arabic simple">
+<li>Open Dolphin and click on where it says Network in the left hand Places column.</li>
+<li>Click on the icon labeled <strong>Add a Network Folder</strong>.</li>
+<li>It should come up with WebDAV already selected. Make sure it is and then click <strong>Next</strong>.</li>
+<li>Enter the following settings:</li>
+</ol>
+<ul>
+<li><p class="first">Name: The name you’ll see in the <strong>Places</strong> bookmark, for example ownCloud</p>
+</li>
+<li><p class="first">User: Your ownCloud username you use to log in, for example admin</p>
+</li>
+<li><p class="first">Server: Your ownCloud domain name, for example <strong>example.org</strong> (without <strong>http://</strong> before or directories afterwards).</p>
+</li>
+<li><p class="first">Folder: Enter:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">owncloud</span><span class="o">/</span><span class="n">remote</span><span class="o">.</span><span class="n">php</span><span class="o">/</span><span class="n">webdav</span>
+</pre></div>
+</div>
+</li>
+</ul>
+<ol class="arabic simple" start="5">
+<li>Create icon checkbox: Tick to get a bookmark in the Places column</li>
+<li>Port & Encrypted checkbox: Leave as it is unless you have special settings or an SSL certificate.</li>
+</ol>
+</div>
+<div class="section" id="mounting-from-command-line">
+<h3>Mounting from command line<a class="headerlink" href="#mounting-from-command-line" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic">
+<li><p class="first">Install the WebDAV support using the davfs package. On Debian/Ubuntu, you can use:</p>
+<div class="highlight-python"><pre>sudo apt-get install davfs2</pre>
+</div>
+</li>
+<li><p class="first">Reconfigure davfs2 to allow access to normal users (select Yes when prompted):</p>
+<div class="highlight-python"><pre>sudo dpkg-reconfigure davfs2</pre>
+</div>
+</li>
+<li><p class="first">Add the users you want to be able to mount the share to the davfs2 group:</p>
+<div class="highlight-python"><pre>sudo usermod -aG davfs2 <user></pre>
+</div>
+</li>
+<li><p class="first">Edit <tt class="file docutils literal"><span class="pre">/etc/fstab</span></tt> and add the following line for each user who wants to mount the folder (with your details where appropriate):</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav /home/<username>/owncloud davfs user,rw,noauto 0 0</pre>
+</div>
+</li>
+</ol>
+<p>Then, as each user who wants to mount the folder:</p>
+<ol class="arabic">
+<li><p class="first">Create the folders <strong>owncloud/</strong> and <strong>.davfs2/</strong> in your home directory</p>
+</li>
+<li><p class="first">Create the file secrets inside <strong>.davfs2/</strong>, fill it with the following (with your credentials where appropriate):</p>
+<div class="highlight-python"><pre>example.org/owncloud/remote.php/webdav <username> <password></pre>
+</div>
+</li>
+<li><p class="first">Ensure the file is only writable by you either through the file manager, or via:</p>
+<div class="highlight-python"><pre>chmod 600 ~/.davfs2/secrets</pre>
+</div>
+</li>
+<li><p class="first">Run the command:</p>
+<div class="highlight-python"><pre>mount ~/owncloud</pre>
+</div>
+</li>
+<li><p class="first">To automatically mount the folder on login, add the command you used in step 4 to <tt class="file docutils literal"><span class="pre">./.bashrc</span></tt></p>
+</li>
+</ol>
+<div class="section" id="known-issues">
+<h4>Known Issues<a class="headerlink" href="#known-issues" title="Permalink to this headline">¶</a></h4>
+<p><strong>Problem:</strong> Resource temporarily unavailable</p>
+<p><strong>Solution:</strong> If you experience trouble when you create a file in the directory, edit <tt class="file docutils literal"><span class="pre">/etc/davfs2/davfs2.conf</span></tt> and add:</p>
+<div class="highlight-python"><pre>use_locks 0</pre>
+</div>
+<p><strong>Problem:</strong> Certificate warnings</p>
+<p><strong>Solution:</strong> If you use a self-signed certificate, you will get a warning. If you are willing to take the risk of a man in the middle attack, run this command instead:</p>
+<div class="highlight-python"><pre>echo "y" | mount ~/owncloud > /dev/null 2>&1</pre>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="macos">
+<h2>MacOS<a class="headerlink" href="#macos" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Finder suffers from a <a class="reference external" href="http://code.google.com/p/sabredav/wiki/Finder">series of implementation problems</a> and should only be used if the ownCloud server runs on <strong>Apache</strong> and <strong>mod_php</strong></p>
+</div>
+<p>In the Finder, choose <strong>Go > Connect to Server,</strong> type the address of the server in the <strong>Server Address</strong> field, and click <strong>Connect</strong>.</p>
+<img alt="../_images/osx_webdav1.png" src="../_images/osx_webdav1.png" />
+<p>The URL that you have to use to connect to the ownCloud installation in finder is:</p>
+<div class="highlight-python"><pre>http://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<img alt="../_images/osx_webdav2.png" src="../_images/osx_webdav2.png" />
+<p>For details, check the respective <a class="reference external" href="http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html">vendor documentation</a> at the Apple website.</p>
+</div>
+<div class="section" id="windows">
+<h2>Windows<a class="headerlink" href="#windows" title="Permalink to this headline">¶</a></h2>
+<p>For Windows a seperate WebDAV client is recommended to access the files from your server. Choose one from the <a class="reference external" href="http://www.webdav.org/projects/">WebDav Project page</a></p>
+<p>Should you have to use the native implementation then you can assign ownCloud a drive letter. This allows you to browse files stored on an ownCloudserver the way you would files stored in a mapped network drive.</p>
+<p>Using this feature requires network connectivity. If you want to store
+your files offline, use the ownCloud Client to sync all files on your
+ownCloud to one or more directories of your local hard drive.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Prior to mapping your drive, you will need to permit the use of Basic Authentication in the Windows Registry. The procedure is documented in <a class="reference external" href="http://support.microsoft.com/kb/841215">KB841215</a> and differs between Windows XP/Server 2003 and Windows Vista/7. Please follow the Knowledge Base article before proceeding, and follow the Vista instructions if you run Windows 7.</p>
+</div>
+<div class="section" id="mapping-via-the-command-line">
+<h3>Mapping via the command line<a class="headerlink" href="#mapping-via-the-command-line" title="Permalink to this headline">¶</a></h3>
+<p>Suppose your ownCloud is installed at <strong>https://example.org/owncloud</strong>,
+that is, entering this URL in your web browser will bring up the login screen.
+Running:</p>
+<div class="highlight-python"><pre>net use Z: https://example.org/owncloud/remote.php/webdav /user:youruser yourpassword</pre>
+</div>
+<p>will map the files of your ownCloud account to the drive letter Z:. An alternative
+syntax is:</p>
+<div class="highlight-python"><pre>net use Z: \\example.org at ssl\owncloud\remote.php\webdav /user:youruser yourpassword</pre>
+</div>
+<p>Appending <strong>/persistent</strong> makes the connection persistent across reboots.</p>
+<p>You can also mount your ownCloud via HTTP, leaving the connection unencrypted.
+Use either of the following syntaxes:</p>
+<div class="highlight-python"><pre>net use Z: http://example.org/owncloud/remote.php/webdav /user:youruser yourpassword
+net use Z: \\example.org\owncloud\remote.php\webdav /user:youruser yourpassword</pre>
+</div>
+<p>Please note that this allows anyone to sniff your ownCloud data with ease, especially on public WiFi hotspots. Plain HTTP should therefore only be used in conjunction with a VPN tunnel when used on Laptops.</p>
+</div>
+<div class="section" id="using-windows-explorer">
+<h3>Using Windows Explorer<a class="headerlink" href="#using-windows-explorer" title="Permalink to this headline">¶</a></h3>
+<p>Right-click on <strong>Computer</strong> entry and select <strong>Map network drive...</strong>. Choose a local network drive to map ownCloud to. Finally, enter the address to your ownCloud instance, followed by <strong>/remote.php/webdav</strong>, e.g.</p>
+<div class="highlight-python"><pre>https://example.org/owncloud/remote.php/webdav</pre>
+</div>
+<p>for an SSL protected server. Check <strong>Reconnect at logon</strong> to make this mapping persistent across reboots. If you want to connect as another user, check <strong>Connect using different credentials</strong>.</p>
+<div class="figure">
+<a class="reference internal image-reference" href="../_images/explorer_webdav.png"><img alt="../_images/explorer_webdav.png" src="../_images/explorer_webdav.png" style="width: 502.4px; height: 366.4px;" /></a>
+<p class="caption">Mapping WebDAV on Windows Explorer.</p>
+</div>
+<p>After pressing <strong>Finish</strong>, Windows Explorer will map the network drive and your ownCloud instance should be available</p>
+</div>
+<div class="section" id="using-cyberduck-4-2-1">
+<h3>Using Cyberduck (4.2.1)<a class="headerlink" href="#using-cyberduck-4-2-1" title="Permalink to this headline">¶</a></h3>
+<p>Specify a server without any leading protocol information. e.g.:</p>
+<dl class="docutils">
+<dt>Server</dt>
+<dd>example.org</dd>
+</dl>
+<p>The port depends on whether your ownCloud server supports SSL or not. Cyberduck requires that you select a different connection type depending on whethr SSL is to be used (‘WebDAV’ or ‘WebDAV (HTTPS/SSL)’):</p>
+<dl class="docutils">
+<dt>Port</dt>
+<dd>80 (for WebDAV)
+443 (for WebDAV (HTTPS/SSL))</dd>
+</dl>
+<p>Use the ‘More Options’ drop-down menu to add the rest of your WebDAV URL into the ‘Path’ field. e.g.:</p>
+<dl class="docutils">
+<dt>Path</dt>
+<dd>remote.php/webdav</dd>
+</dl>
+</div>
+<div class="section" id="known-problems">
+<h3>Known Problems<a class="headerlink" href="#known-problems" title="Permalink to this headline">¶</a></h3>
+<dl class="docutils">
+<dt>Problem</dt>
+<dd>Windows refuses to connect via HTTPS</dd>
+<dt>Solution</dt>
+<dd>The Windows WebDAV Client does not support Server Name Indication (SNI) on
+encrypted connections. If you encounter an error mounting an SSL-encrypted
+ownCloud instance, please contact your provider about assigning a dedicated
+IP address for your SSL-based server.</dd>
+<dt>Problem</dt>
+<dd>I receive the error <strong>Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.</strong></dd>
+<dt>Solution</dt>
+<dd>Windows limits the maximum size a file transferred from or to a WebDAV
+share may have. You can increase the value <strong>FileSizeLimitInBytes</strong> in
+<strong>HKEY_LOCAL_MACHINESYSTEMCurrentControlSetServicesWebClientParameters</strong>.
+by clicking on <strong>Modify</strong>. In order to increase the limit to the maximum
+value of 4GB, pick <strong>Decimal</strong> and enter <strong>4294967295</strong> as value. Afterwards,
+reboot Windows or restart the <strong>WebClient</strong> service.</dd>
+</dl>
+<div class="admonition-todo admonition" id="index-0">
+<p class="first admonition-title">Todo</p>
+<p class="last">document registry keys on file size limit and not complaining in no network cases</p>
+</div>
+</div>
+</div>
+<div class="section" id="sync-client">
+<h2>Sync Client<a class="headerlink" href="#sync-client" title="Permalink to this headline">¶</a></h2>
+<p>However, some applications only allow you to save to a local folder. To
+get around this issue, you can use the <a class="reference external" href="http://owncloud.org/documentation/sync-clients/">ownCloud sync clients</a></p>
+</div>
+<div class="section" id="mobile">
+<h2>Mobile<a class="headerlink" href="#mobile" title="Permalink to this headline">¶</a></h2>
+<p>To connect to your ownCloud server with the <strong>ownCloud</strong> mobile apps, use the base URL and folder only:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span>
+</pre></div>
+</div>
+<p>No need to add remote.php/webdav as you do for any other WebDAV client.</p>
+<p>There are apps in development for both <a class="reference external" href="http://github.com/owncloud/android">Android</a> and <a class="reference external" href="http://github.com/owncloud/webos">webOS</a>. Feel
+free to <a class="reference external" href="/contribute/">contribute, if you can</a>! Right now you can use other apps to
+connect to ownCloud from your phone via WebDAV. <a class="reference external" href="http://seanashton.net/webdav/">WebDAV Navigator</a> is a
+good (proprietary) app for <a class="reference external" href="https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite">Android App</a> , <a class="reference external" href="https://itunes.apple.com/app/webdav-navigator/id382551345">iPhone</a> & <a class="reference external" href="http://appworld.blackberry.com/webstore/content/46816">BlackBerry</a>.</p>
+<p>The URL for these is:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">example</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">owncloud</span><span class="o">/</span><span class="n">remote</span><span class="o">.</span><span class="n">php</span><span class="o">/</span><span class="n">webdav</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/filesweb.html
index 84d4c52,0000000..8b5dd57
mode 100644,000000..100644
--- a/core/doc/user/files/filesweb.html
+++ b/core/doc/user/files/filesweb.html
@@@ -1,244 -1,0 +1,244 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Accessing your Files (Web Interface) — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Accessing your Files (WebDAV)" href="files.html" />
+ <link rel="prev" title="Files & Synchronization" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Accessing your Files (Web Interface)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#navigating-inside-your-owncloud">Navigating inside your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-uploading-files">Creating/uploading files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#selecting-files">Selecting files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#viewing-files">Viewing files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#moving-files">Moving files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-files">Sharing files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="accessing-your-files-web-interface">
+<h1>Accessing your Files (Web Interface)<a class="headerlink" href="#accessing-your-files-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>Your ownCloud files can be accessed from anywhere by using your ownCloud’s web interface. In the files app,
+you can view (if a common type), move, rename, download, share and delete your files easily. If versioning app is
+enabled, you can also revert a file to specific version. See <a class="reference internal" href="versioncontrol.html"><em>Version Control</em></a> for details.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb.png" src="../_images/oc_filesweb.png" />
+</div>
+<p>Files app on ownCloud web interface</p>
+<p>With ownCloud 6, you can now see file thumbnails next to the filenames. By hovering your cursor on a file, you
+will be provided with some file operations. You can use rename, download, share buttons to perform those actions
+or click on the cross icon at the rightmost location to remove the hovered file. If the file is an editable
+office file, it will also show <em>Edit</em> button to open the file in documents app (if this app is enabled).</p>
+<div class="section" id="navigating-inside-your-owncloud">
+<h2>Navigating inside your ownCloud<a class="headerlink" href="#navigating-inside-your-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>To navigate through folders in your ownCloud, you can simply click on a folder name. The navigation bar
+will show your current directory:</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_navigate.png" src="../_images/oc_filesweb_navigate.png" />
+</div>
+<p>Navigation bar</p>
+<p>You can click on one of the upper directories to navigate up or use home icon to navigate back into your root
+folder.</p>
+</div>
+<div class="section" id="creating-uploading-files">
+<h2>Creating/uploading files<a class="headerlink" href="#creating-uploading-files" title="Permalink to this headline">¶</a></h2>
+<p>You can create files by simply clicking on <em>New</em> button on files app. The <em>New</em> button will provide three
+options to choose from:</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_new.png" src="../_images/oc_filesweb_new.png" />
+</div>
+<p>New button options</p>
+<ul class="simple">
+<li><em>Text file</em> will create a simple text file and add into the current folder in your ownCloud.</li>
+<li><em>Folder</em> will create a folder in current folder.</li>
+<li><em>From link</em> will download the file from the provided link and place it into the current folder.</li>
+</ul>
+</div>
+<div class="section" id="selecting-files">
+<h2>Selecting files<a class="headerlink" href="#selecting-files" title="Permalink to this headline">¶</a></h2>
+<p>You can select one or more files by clicking on small thumbnails or icons of the files. To select all files in
+the current directory, use the checkbox just above the first file/folder on the list.</p>
+<p>If you select multiple files, selected files can be deleted or downloaded as ZIP by using the buttons just above of the file list.
+If download button is not visible, this means that administrator had disabled this feature.</p>
+</div>
+<div class="section" id="viewing-files">
+<h2>Viewing files<a class="headerlink" href="#viewing-files" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud can display uncompressed text files, OpenDocument files, PDFs, and image files by simply clicking on
+the file name. If displaying of a file is not possible, a download process will start.</p>
+</div>
+<div class="section" id="moving-files">
+<h2>Moving files<a class="headerlink" href="#moving-files" title="Permalink to this headline">¶</a></h2>
+<p>In ownCloud web interface, file(s) can be moved by dragging and dropping them into a sub-directory. If you would like move a directory to an upper directory, drag the file(s) into one of the folders shown in navigation bar.</p>
+</div>
+<div class="section" id="sharing-files">
+<h2>Sharing files<a class="headerlink" href="#sharing-files" title="Permalink to this headline">¶</a></h2>
+<p>Any file/folder on ownCloud can be shared to download with a local user, group or any person online with a public link. Shared files/folders will show a <em>Shared</em> text next to their names.</p>
+<p>To share a file/folder, hover your cursor on an item in the files app and click <em>Share</em>. You will be provided with some options:</p>
+<div class="figure">
+<img alt="../_images/oc_files_share.png" src="../_images/oc_files_share.png" />
+</div>
+<p>Share dialog</p>
+<ul class="simple">
+<li>The first field is to share this file/folder with local users/groups. This is very useful
+if you are in a company and want to create a quick share with a collegue.</li>
+<li>If you click on <em>Share link</em>, the other options will be visible. Since this link allows everyone
+to download this file/folder, you may want to protect this share with a password. To do that,
+click on <em>Password protect</em> and set a password.</li>
+<li>If this share is a folder, you will also have an option to enable uploads into this folder using
+the provided link. This is very useful to collect files from multiple users into same place easily.</li>
+<li>If your server is configured with a mail server, you can type e-mail addresses seperated with space to send the link to multiple users.</li>
+<li>Finally, setting an expiration date will expiry the share after the specified date.</li>
+</ul>
+<p>If you type a user and/or group to the <em>share with</em> field, you will be given extra sharing options such as informing via e-mail,
+letting users edit (create, update, delete, re-share) the share. To revoke permissions from users, simply click on cross icon
+on the same line with the users.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/index.html
index d872d0d,0000000..d62099c
mode 100644,000000..100644
--- a/core/doc/user/files/index.html
+++ b/core/doc/user/files/index.html
@@@ -1,172 -1,0 +1,172 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Files & Synchronization — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="next" title="Accessing your Files (Web Interface)" href="filesweb.html" />
+ <link rel="prev" title="The ownCloud Web Interface" href="../webinterface.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Files & Synchronization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="files-synchronization">
+<h1>Files & Synchronization<a class="headerlink" href="#files-synchronization" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l1"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l1"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/quota.html
index 8843133,0000000..00220a1
mode 100644,000000..100644
--- a/core/doc/user/files/quota.html
+++ b/core/doc/user/files/quota.html
@@@ -1,229 -1,0 +1,229 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Storage Quota — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Big Files" href="configuring_big_file_upload.html" />
+ <link rel="prev" title="Files Encryption" href="encryption.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Storage Quota</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#checking-the-available-space">Checking the available space</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing">Sharing</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#excluded-from-quota">Excluded from quota</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="storage-quota">
+<h1>Storage Quota<a class="headerlink" href="#storage-quota" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud makes it possible to specify a storage quota for users which is the <strong>maximum space</strong> a user is allowed to use for files located in their individual home storage.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">When setting a quota, administrators need to be aware that it <strong>only applies to actual files</strong>, not application metadata. This means that when allocating a quota, they need to make sure there at least 10% more space available for a given user.</p>
+</div>
+<div class="section" id="checking-the-available-space">
+<h2>Checking the available space<a class="headerlink" href="#checking-the-available-space" title="Permalink to this headline">¶</a></h2>
+<p>You can check your available space by going to the “Personal” page from the top-right menu.</p>
+<p>The available space of a given user is calculated using the following formula:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">available_space</span> <span class="o">=</span> <span class="nb">min</span><span class="p">(</span><span class="n">quota</span><span class="p">,</span> <span class="n">disk_free_space</span><span class="p">)</span> <span class="o">-</span> <span class="n">used_space</span>
+</pre></div>
+</div>
+<p><tt class="docutils literal"><span class="pre">disk_free_space</span></tt> is the space available on the partition on which the user’s home storage is located on the server. It could happen that the available space on that partition is less than the user’s quota.</p>
+</div>
+<div class="section" id="sharing">
+<h2>Sharing<a class="headerlink" href="#sharing" title="Permalink to this headline">¶</a></h2>
+<p>When sharing files or directories, their used space is counted in the owner’s quota.</p>
+<div class="section" id="shared-files">
+<h3>Shared files<a class="headerlink" href="#shared-files" title="Permalink to this headline">¶</a></h3>
+<p>If user A shares a file F with user B, the size of F will be counted in user A’s storage, even if the file is modified or its size is increased by user B.</p>
+</div>
+<div class="section" id="shared-directories">
+<h3>Shared directories<a class="headerlink" href="#shared-directories" title="Permalink to this headline">¶</a></h3>
+<p>If user A shares a directory D with user B, any file that is modified or uploaded by user B inside of directory D will count in user A’s used space.</p>
+</div>
+<div class="section" id="resharing">
+<h3>Resharing<a class="headerlink" href="#resharing" title="Permalink to this headline">¶</a></h3>
+<p>When resharing a file or a directory, the used space is still counted in the quota of the owner who shared it initially.</p>
+</div>
+<div class="section" id="public-sharing-with-upload-permission">
+<h3>Public sharing with upload permission<a class="headerlink" href="#public-sharing-with-upload-permission" title="Permalink to this headline">¶</a></h3>
+<p>If user A publicly shares (share with link) a directory D and enables the “public upload” permission, people with the link will be able to upload files into D and their sizes will be counted in user A’s used space.</p>
+</div>
+</div>
+<div class="section" id="excluded-from-quota">
+<h2>Excluded from quota<a class="headerlink" href="#excluded-from-quota" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="metadata-and-cache">
+<h3>Metadata and cache<a class="headerlink" href="#metadata-and-cache" title="Permalink to this headline">¶</a></h3>
+<p>Application metadata and cached information are excluded from the total used space.</p>
+<p>Such data could be thumbnails (icon previews, pictures app), temporary files, encryption keys, etc.</p>
+<p>Some apps are also storing information directly in the database (not as files) like the <a class="reference internal" href="../pim/calendar.html"><em>calendar</em></a> and <a class="reference internal" href="../pim/contacts.html"><em>contacts</em></a> apps. This data is also excluded from the total used space.</p>
+</div>
+<div class="section" id="deleted-files">
+<h3>Deleted files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h3>
+<p>When deleting files, these are moved/copied to the <a class="reference internal" href="deletedfiles.html"><em>trashbin</em></a> at first. These files do not count in the user’s used space.</p>
+<p>For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB in the trashbin, they will still see 6 GB free space. If the user uploads 6 GB of files at this point, the <a class="reference internal" href="deletedfiles.html"><em>trashbin app</em></a> will discard deleted files when necessary to make room for the new files.</p>
+</div>
+<div class="section" id="version-control">
+<h3>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h3>
+<p>The size of older file versions does not count in the used space.</p>
+<p>For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB of older file versions, they will still see 6 GB free space. If the user uploads 6 GB of files at this point, the <a class="reference internal" href="versioncontrol.html"><em>versions app</em></a> will discard older versions when necessary to make room for the new files.</p>
+<p>See <a class="reference internal" href="versioncontrol.html"><em>Version Control</em></a> for details about the version expiration behavior.</p>
+</div>
+<div class="section" id="encryption">
+<h3>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h3>
+<p>When files are <a class="reference internal" href="encryption.html"><em>encrypted</em></a>, they take slightly more physical space than the original files. Only the original size will be counted in the used space.</p>
+</div>
+<div class="section" id="external-storage">
+<h3>External storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h3>
+<p>When mounting external storage, either as administrator or as user, the space available on that storage is not taken into account for the user’s quota.
+It is currently not possible to set a quota for external storage.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/sync.html
index 0594de5,0000000..497f7dc
mode 100644,000000..100644
--- a/core/doc/user/files/sync.html
+++ b/core/doc/user/files/sync.html
@@@ -1,173 -1,0 +1,173 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Desktop Synchronization — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Files Encryption" href="encryption.html" />
+ <link rel="prev" title="Deleted Files" href="deletedfiles.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="desktop-synchronization">
+<h1>Desktop Synchronization<a class="headerlink" href="#desktop-synchronization" title="Permalink to this headline">¶</a></h1>
+<p>For synchronizing files with your desktop computer, we recommend using the
+<a class="reference external" href="http://owncloud.org/sync-client/">ownCloud Client</a> for Windows, Mac OS X and Linux.</p>
+<p>The ownCloud Desktop Client enables you to connect to your private ownCloud Server.
+You can create folders in your home directory, and keep the contents of those
+folders synced with your ownCloud server. Simply copy a file into the directory
+and the ownCloud desktop client does the rest. Make a change to the files on one
+computer, it will flow across the others using these desktop sync clients. Always
+have your latest files with you wherever you are.</p>
+<p>Its usage is documented separately in the <a class="reference external" href="http://doc.owncloud.com/desktop">ownCloud Desktop Client Manual</a>.</p>
+<p>Furthermore, It is possible to synchronize your ownCloud calendar and address book
+with a variety of different operating systems and devices. It is also possible to
+mount your ownCloud storage via WebDAV, which is also documented in the next chapters.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/versioncontrol.html
index 8ac6708,0000000..df465cd
mode 100644,000000..100644
--- a/core/doc/user/files/versioncontrol.html
+++ b/core/doc/user/files/versioncontrol.html
@@@ -1,190 -1,0 +1,190 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Version Control — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Deleted Files" href="deletedfiles.html" />
+ <link rel="prev" title="Accessing your Files (WebDAV)" href="files.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files (Web Interface)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing your Files (WebDAV)</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Files Encryption</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="version-control">
+<h1>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud supports simple version control for files. Versioning creates backups
+of files which are accessible via the Versions link. This link contains the
+history of the file where you can roll back a file to any previous version. Changes
+made at intervals greater than two minutes are saved in data/[user]/versions,
+and made accessible using the above pages.</p>
+<p>To restore a specific version of a file, hover your cursor on a file and click
+<em>Versions</em> link. If any version is available, you should see a list like the image
+below:</p>
+<div class="figure">
+<img alt="../_images/files_versioning.png" src="../_images/files_versioning.png" />
+</div>
+<p>Clicking on <em>Restore</em> next to any version will revert the file to that
+version back.</p>
+<p>The versioning app expires old versions automatically to make sure that
+the user doesn’t run out of space. Following pattern is used to delete
+old versions:</p>
+<ul class="simple">
+<li>For the first 10 seconds ownCloud keeps one version every 2 seconds</li>
+<li>For the first minute ownCloud keeps one version every 10 seconds</li>
+<li>For the first hour ownCloud keeps one version every minute</li>
+<li>For the first 24 hours ownCloud keeps one version every hour</li>
+<li>For the first 30 days ownCloud keeps one version every day</li>
+<li>After the first 30 days ownCloud keeps one version every week</li>
+</ul>
+<p>The versions are adjusted along this pattern every time a new version gets
+created.</p>
+<p>Beside that the version app takes care to never use more that 50% of the users
+currently available free space. If the stored versions exceed this limit ownCloud
+delete the oldest versions until it meets the memory usage limit again.</p>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/genindex.html
index d6a3789,0000000..d1e9cb1
mode 100644,000000..100644
--- a/core/doc/user/genindex.html
+++ b/core/doc/user/genindex.html
@@@ -1,153 -1,0 +1,153 @@@
+
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Index — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+
+<h1 id="index">Index</h1>
+
+<div class="genindex-jumpbox">
+
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/index.html
index 3aec767,ede62f0..b0860a3
--- a/core/doc/user/index.html
+++ b/core/doc/user/index.html
@@@ -1,230 -1,2 +1,230 @@@
-Here goes the user documentation
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
- <title>User Documentation — ownCloud User Manual 6.0 documentation</title>
++ <title>ownCloud 6.0 User Documentation — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="#" />
+ <link rel="next" title="The ownCloud Web Interface" href="webinterface.html" />
+ <link rel="prev" title="ownCloud documentation contents" href="contents.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul class="current">
- <li class="toctree-l1 current"><a class="current reference internal" href="">User Documentation</a><ul>
++<li class="toctree-l1 current"><a class="current reference internal" href="">ownCloud 6.0 User Documentation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#web-interface">Web interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#files-synchronization">Files & Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#contacts-calendar">Contacts & Calendar</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#documents">Documents</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#bookmarks">Bookmarks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#backup">Backup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#external-storage">External storage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
- <div class="section" id="user-documentation">
- <span id="index"></span><h1>User Documentation<a class="headerlink" href="#user-documentation" title="Permalink to this headline">¶</a></h1>
++ <div class="section" id="owncloud-version-user-documentation">
++<span id="index"></span><h1>ownCloud 6.0 User Documentation<a class="headerlink" href="#owncloud-version-user-documentation" title="Permalink to this headline">¶</a></h1>
+<p><strong>Welcome to ownCloud, your self-hosted file sync and share solution.</strong></p>
+<p>ownCloud is open source file sync and share software for everyone from individuals operating the free Community Edition, to large enterprises and service providers operating ownCloud Enterprise Edition. ownCloud provides a safe, secure and compliant file sync and share solution on servers you control.</p>
+<p>With ownCloud you can share one or more folders on your PC, and sync them with your ownCloud server. Place files in your local shared directories, and those files are immediately synced to the server, and then to other PCs via the desktop client. Not near a desktop client? No problem, simply log in with the web client and manage your files there. The Android and iOS mobile apps allow you to browse, download and upload photos and videos. On Android, you may also create, download, edit [...]
+<p>Whether using a mobile device, a workstation, or a web client, ownCloud provides the ability to put the right files in the right hands at the right time on any device in one simple-to-use, secure, private and controlled solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.</p>
+<div class="section" id="web-interface">
+<h2>Web interface<a class="headerlink" href="#web-interface" title="Permalink to this headline">¶</a></h2>
+<p>This chapter contains a general overview how you access ownCloud from a Browser like Firefox, Chrome or Internet Explorer</p>
+<ul class="simple">
+<li><a class="reference internal" href="webinterface.html"><em>The ownCloud Web Interface</em></a></li>
+</ul>
+</div>
+<div class="section" id="files-synchronization">
+<h2>Files & Synchronization<a class="headerlink" href="#files-synchronization" title="Permalink to this headline">¶</a></h2>
+<p>This chapter contains information about accessing your files via WebDAV and Synchronization.</p>
+<ul class="simple">
+<li><a class="reference internal" href="files/filesweb.html"><em>Accessing your Files (Web Interface)</em></a></li>
+<li><a class="reference internal" href="files/files.html"><em>Accessing your Files (WebDAV)</em></a></li>
+<li><a class="reference internal" href="files/sync.html"><em>Desktop Synchronization</em></a></li>
+<li><a class="reference internal" href="files/versioncontrol.html"><em>Version Control</em></a></li>
+<li><a class="reference internal" href="files/deletedfiles.html"><em>Deleted Files</em></a></li>
+<li><a class="reference internal" href="files/encryption.html"><em>Files Encryption</em></a></li>
+<li><a class="reference internal" href="files/quota.html"><em>Storage Quota</em></a></li>
+<li><a class="reference internal" href="files/configuring_big_file_upload.html"><em>Big Files</em></a></li>
+</ul>
+</div>
+<div class="section" id="contacts-calendar">
+<h2>Contacts & Calendar<a class="headerlink" href="#contacts-calendar" title="Permalink to this headline">¶</a></h2>
+<p>Contacts & Calendar web interface, export, import and synchronization.</p>
+<ul class="simple">
+<li><a class="reference internal" href="pim/calendar.html"><em>Using the Calendar App</em></a></li>
+<li><a class="reference internal" href="pim/contacts.html"><em>Using the Contacts App</em></a></li>
+<li><a class="reference internal" href="pim/sync_ios.html"><em>iOS - Synchronize iPhone/iPad</em></a></li>
+<li><a class="reference internal" href="pim/sync_kde.html"><em>Synchronizing with KDE SC</em></a></li>
+<li><a class="reference internal" href="pim/sync_osx.html"><em>Synchronizing with OS X</em></a></li>
+</ul>
+</div>
+<div class="section" id="documents">
+<h2>Documents<a class="headerlink" href="#documents" title="Permalink to this headline">¶</a></h2>
+<p>Documents allows users collaboratively edit rich-text documents at the same time.</p>
+<ul class="simple">
+<li><a class="reference internal" href="documents.html"><em>Documents</em></a></li>
+</ul>
+</div>
+<div class="section" id="bookmarks">
+<h2>Bookmarks<a class="headerlink" href="#bookmarks" title="Permalink to this headline">¶</a></h2>
+<p>Web interface for managing your bookmarks.</p>
+<ul class="simple">
+<li><a class="reference internal" href="bookmarks.html"><em>Using the Bookmarks App</em></a></li>
+</ul>
+</div>
+<div class="section" id="backup">
+<h2>Backup<a class="headerlink" href="#backup" title="Permalink to this headline">¶</a></h2>
+<p>Import and export your user account settings.</p>
+<ul class="simple">
+<li><a class="reference internal" href="migration.html"><em>User Account Migration</em></a></li>
+</ul>
+</div>
+<div class="section" id="external-storage">
+<h2>External storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h2>
+<p>Mount external storages into ownCloud.</p>
+<ul class="simple">
+<li><a class="reference internal" href="external_storage/google_drive.html"><em>External storage</em></a></li>
+</ul>
+</div>
+<div class="section" id="indices-and-tables">
+<h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
+</ul>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/migration.html
index 2026e22,0000000..349ba57
mode 100644,000000..100644
--- a/core/doc/user/migration.html
+++ b/core/doc/user/migration.html
@@@ -1,173 -1,0 +1,173 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>User Account Migration — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <link rel="next" title="Changing Preferences" href="userpreferences.html" />
+ <link rel="prev" title="Documents" href="documents.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">User Account Migration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#export">Export</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#import">Import</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="user-account-migration">
+<h1>User Account Migration<a class="headerlink" href="#user-account-migration" title="Permalink to this headline">¶</a></h1>
+<p>User account migration support is provided by the user_migrate app. It is important to note that only data from apps that support migration will be migrated. While we encourage all apps to support migration, it is not a requirement and it the responsibility of the app developer.</p>
+<div class="section" id="export">
+<h2>Export<a class="headerlink" href="#export" title="Permalink to this headline">¶</a></h2>
+<p>To export your user account, simply visit Settings > Personal and click on the ‘Export’ button. A compressed zip file will be generated on the fly and downloaded to your computer. This file includes all of your files and application data that was stored on your ownCloud account. You may use this as a method of backing up your personal account.</p>
+</div>
+<div class="section" id="import">
+<h2>Import<a class="headerlink" href="#import" title="Permalink to this headline">¶</a></h2>
+<p>To import your user account, you must first have an existing account on your new ownCloud install. Then follow this procedure:</p>
+<ol class="arabic simple">
+<li>Login to your new account on the new ownCloud instance</li>
+<li>Navigate to the Settings > Personal page</li>
+<li>Select the ‘Import’ button, and locate the zip file that you downloaded from your old ownCloud instance</li>
+<li>Wait for the file to be uploaded and imported</li>
+</ol>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Your user account credentials will <strong>not</strong> be migrated.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/objects.inv
index 7bd7fb3,0000000..37c6132
mode 100644,000000..100644
Binary files differ
diff --cc core/doc/user/pim/calendar.html
index 717d473,0000000..79b8f33
mode 100644,000000..100644
--- a/core/doc/user/pim/calendar.html
+++ b/core/doc/user/pim/calendar.html
@@@ -1,259 -1,0 +1,259 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Using the Calendar App — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="iOS - Synchronize iPhone/iPad" href="sync_ios.html" />
+ <link rel="prev" title="Using the Contacts App" href="contacts.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using the Calendar App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-calendar">Creating a calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#synchronising-calendars-with-caldav">Synchronising Calendars with CalDAV</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-events">Creating events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#exporting-importing-events">Exporting / Importing events</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#why-is-the-calendar-app-asking-for-my-current-location">Why is the calendar app asking for my current location?</a></li>
+</ul>
+</li>
+<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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="using-the-calendar-app">
+<h1>Using the Calendar App<a class="headerlink" href="#using-the-calendar-app" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="creating-a-calendar">
+<h2>Creating a calendar<a class="headerlink" href="#creating-a-calendar" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="../_images/calendar_manage-calendars.png" src="../_images/calendar_manage-calendars.png" />
+</div>
+<p>Calendar view</p>
+<p>If you use the calendar the first time, there will be already a calendar called
+“Default calendar”. You can manage your calendars with a click on the “Calendar”
+button in the top right corner. In the dialog, which will appear, you can add,
+edit, export, enable, disable and delete your calendars. There will be also a
+link for CalDAV access.</p>
+</div>
+<div class="section" id="synchronising-calendars-with-caldav">
+<h2>Synchronising Calendars with CalDAV<a class="headerlink" href="#synchronising-calendars-with-caldav" title="Permalink to this headline">¶</a></h2>
+<p>Assuming you access your web interface via an address like this:</p>
+<div class="highlight-python"><pre>http://ADDRESS</pre>
+</div>
+<p>Then you can access your calendars with CalDAV-compatible programs like
+Kontact, Evolution, Thunderbird using the following URL:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav</pre>
+</div>
+<p>To use the ownCloud calendar with Apple iCal you will need to use the following
+URL, including the trailing slash:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav/principals/username/</pre>
+</div>
+<p>Mozilla Lightning users need to this URL scheme:</p>
+<div class="highlight-python"><pre>https://ADDRESS/remote.php/caldav/calendars/USERNAME/CALENDARNAME
+
+ Example for a simple calendar: The "Default calendar" is referred to as "defaultcalendar",
+ and the users' name here is "test".
+ The full URL (which on the picture can't be seen because of the
+ short edit field) is then::
+
+ https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar</pre>
+</div>
+</div>
+<div class="section" id="creating-events">
+<h2>Creating events<a class="headerlink" href="#creating-events" title="Permalink to this headline">¶</a></h2>
+<p>To create an event just click on the date in the month view or choose the
+timeframe in the weekview. In the dialog which will appear you can enter your
+information like title, category, etc.</p>
+<div class="figure">
+<img alt="../_images/calendar_createevent.png" src="../_images/calendar_createevent.png" />
+</div>
+<p>New event window</p>
+<p>With the advanced options you can set the
+description, the location and the repetition rate of an event. If the repeating
+should end you can choose between setting the end by date or by occurrences. If
+you choose in the weekview all days from Monday to Friday it will automatically
+set the repeat rule to “every weekday”. If the interval of the weekview can be
+divided by two it automatically set the repeat rule to “Bi-Weekly”.</p>
+</div>
+<div class="section" id="exporting-importing-events">
+<h2>Exporting / Importing events<a class="headerlink" href="#exporting-importing-events" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="export">
+<h3>Export<a class="headerlink" href="#export" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/calendar_export.png" src="../_images/calendar_export.png" />
+</div>
+<p>Exporting an event</p>
+<p>You can export either a single event or a whole calendar. If you want to export
+a single event click on it and press the export button in the bottom right
+corner. If you want to export a whole calendar use the “Calendar” button as
+described in the chapter “Creating a calendar”.</p>
+</div>
+<div class="section" id="import">
+<h3>Import<a class="headerlink" href="#import" title="Permalink to this headline">¶</a></h3>
+<div class="figure">
+<img alt="../_images/calendar_import.png" src="../_images/calendar_import.png" />
+</div>
+<p>Importing events</p>
+<p>Import your calendar as iCal file using the files app. Just click on the
+calendar file to open the import dialog. You can import the calendar into a new
+calendar or into an already existing calendar.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If the progress bar does not work properly, the folder
+<tt class="docutils literal"><span class="pre">apps/calendar/import_tmp/</span></tt> has probably no write permission.</p>
+</div>
+</div>
+</div>
+<div class="section" id="why-is-the-calendar-app-asking-for-my-current-location">
+<h2>Why is the calendar app asking for my current location?<a class="headerlink" href="#why-is-the-calendar-app-asking-for-my-current-location" title="Permalink to this headline">¶</a></h2>
+<div class="figure">
+<img alt="../_images/calendar_newtimezone1.png" src="../_images/calendar_newtimezone1.png" />
+</div>
+<p>Timezone set notification</p>
+<p>The calendar needs your current position in order to detect your timezone.
+Without the correct timezone there will be a time offset between the events in
+ownCloud and your desktop calendar you synchronise with ownCloud. You can also
+set the timezone manually in the personal settings.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/contacts.html
index 7ca7fd0,0000000..6426972
mode 100644,000000..100644
--- a/core/doc/user/pim/contacts.html
+++ b/core/doc/user/pim/contacts.html
@@@ -1,290 -1,0 +1,290 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Using the Contacts App — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Using the Calendar App" href="calendar.html" />
+ <link rel="prev" title="Contacts & Calendar" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using the Contacts App</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#adding-contacts">Adding contacts</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-new-addressbooks">Creating new addressbooks</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#keeping-your-addressbook-in-sync">Keeping your addressbook in sync</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#it-doesn-t-work">It doesn’t work!!!</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="using-the-contacts-app">
+<h1>Using the Contacts App<a class="headerlink" href="#using-the-contacts-app" title="Permalink to this headline">¶</a></h1>
+<p>The contacts app of ownCloud is like any other mobile contact app but with more functionality.
+Just as you open your account you will get the a default addressbook available.
+We will see later that Of course you can always add and remove addressbooks in here.</p>
+<div class="section" id="adding-contacts">
+<h2>Adding contacts<a class="headerlink" href="#adding-contacts" title="Permalink to this headline">¶</a></h2>
+<p>There are two ways in which you can add contacts</p>
+<ol class="arabic simple">
+<li>Add them manually</li>
+<li>Import a VCF file</li>
+</ol>
+<div class="section" id="importing">
+<h3>Importing<a class="headerlink" href="#importing" title="Permalink to this headline">¶</a></h3>
+<p>So first we’ll check out how to import all the VCF files as they are a lot
+more faster way of creating contacts.
+Just below the contact list, click on the gear button:</p>
+<img alt="../_images/contact_bottombar.png" src="../_images/contact_bottombar.png" />
+<p>Contact settings icon</p>
+<p>Once you’ve clicked it, an up arrow button which lets you upload files will be shown:</p>
+<img alt="../_images/contact_uploadbutton.png" src="../_images/contact_uploadbutton.png" />
+<p>Contact file upload icon</p>
+<p>After choosing an addressbook to import into, click on the arrow. The upload window will be opened and let you choose your files.
+You can upload the files one by one or upload all of them at one go.</p>
+<p>Let us demonstrate.
+Open the directory in which you store all the files and then do the following
+Keep pressing CTRL and select the files to upload.
+After you are done just click on the open button
+After the upload it should look something like this in which all the names and contacts will be sorted alphabetically</p>
+<img alt="../_images/contact_vcfpick.jpg" src="../_images/contact_vcfpick.jpg" />
+<p>Picking VCF files</p>
+<p>After upload, the interface will automatically place your contacts into ownCloud.</p>
+</div>
+<div class="section" id="create-contacts-manually">
+<h3>Create contacts manually<a class="headerlink" href="#create-contacts-manually" title="Permalink to this headline">¶</a></h3>
+<p>On the left side of contacts app, you could see the new contact button (first one).
+Click on it. You can now see an empty contact in the main part of the interface.
+You have the ability to add all your informations about the contact:
+the name, the address, the e-mail, the telephone nr, etc.</p>
+<p>Just click on a field and start typing the information.
+You can use the “Add Field” button to add another types of information for this contact.</p>
+<img alt="../_images/contact_emptycontact.png" src="../_images/contact_emptycontact.png" />
+<p>Empty contact view</p>
+<p>When you want to remove an information of your contact, just click on little delete icon
+at the right of the field you want to remove.</p>
+</div>
+<div class="section" id="adding-picture-to-the-contact">
+<h3>Adding picture to the contact<a class="headerlink" href="#adding-picture-to-the-contact" title="Permalink to this headline">¶</a></h3>
+<p>There are two methods in which you can give a picture id to the specific contact</p>
+<img alt="../_images/contact_picture.jpg" src="../_images/contact_picture.jpg" />
+<p>Contact picture options</p>
+<ol class="arabic simple">
+<li><strong>Direct upload</strong></li>
+<li><strong>Select pics already uploaded in ownCloud files.</strong></li>
+</ol>
+<p>After you have selected the picture for the contact you get
+an option to crop the picture to suit your requirements</p>
+<img alt="../_images/contact_crop.jpg" src="../_images/contact_crop.jpg" />
+<p>Cropping contact picture</p>
+<p>You can crop the picture however you wish and then press OK.</p>
+<p>As you can see it is really easy to set things right in this app.
+It automatically picks up the First name, Middle name (if any) and the last name
+You may add or delete any section you want for your own convenience.</p>
+</div>
+</div>
+<div class="section" id="creating-new-addressbooks">
+<h2>Creating new addressbooks<a class="headerlink" href="#creating-new-addressbooks" title="Permalink to this headline">¶</a></h2>
+<p>When you click on settings button on bottom bar,
+you will have access to the application’s settings.
+Then, you will be shown all available addressbooks to access the options.</p>
+<img alt="../_images/contact_del_ab.png" src="../_images/contact_del_ab.png" />
+<p>Addressbook options</p>
+<p>There, you have the ability to add, delete, download or share your addressbooks.
+Hover your cursor on every icon to see what they mean.</p>
+</div>
+<div class="section" id="keeping-your-addressbook-in-sync">
+<h2>Keeping your addressbook in sync<a class="headerlink" href="#keeping-your-addressbook-in-sync" title="Permalink to this headline">¶</a></h2>
+<p>One of the most important thing in any contact app is to keep it in Sync.
+You can sync this contact app to your phone which has the following OS’s- Android and iOS</p>
+<div class="section" id="syncing-with-android">
+<h3>Syncing with Android<a class="headerlink" href="#syncing-with-android" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>Install CardDAV- Sync free from Google play store by visiting <a class="reference external" href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">this link</a>.</li>
+<li>This app supports auto- configuration which is a Boon- after installing visit this link - carddavs://example.org/remote.php/carddav/ to auto-configure the app.</li>
+<li>Enter your login details</li>
+<li>After the app has checked your login details you may just select- Sync server to phone option</li>
+<li>That’s it there is nothing else to do for Android :)</li>
+</ol>
+<img alt="../_images/contact_syncopt.jpg" src="../_images/contact_syncopt.jpg" />
+</div>
+<div class="section" id="syncing-your-ios-device">
+<h3>Syncing your iOS device<a class="headerlink" href="#syncing-your-ios-device" title="Permalink to this headline">¶</a></h3>
+<p>Synchronizing the Address book</p>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail, Contacts, Calendars.</li>
+<li>Select Add Account.</li>
+<li>Select other as account type.</li>
+<li>Select Add CardDAV account.</li>
+<li>For server, type <a class="reference external" href="http://example.org/remote.php/carddav/principals/username">http://example.org/remote.php/carddav/principals/username</a></li>
+<li>Enter your user name and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning will be displayed. Select Continue.</li>
+<li>If the iPhone is unable to verify the account information perform the following:</li>
+</ol>
+<ul class="simple">
+<li>Select OK.</li>
+<li>Select advanced settings.</li>
+<li>Make sure Use SSL is set to OFF.</li>
+<li>Change port to 80.</li>
+<li>Go back to account information and hit Save.</li>
+</ul>
+<p>Now should now find your contacts in the address book of your iPhone.</p>
+</div>
+<div class="section" id="other-syncing-options-provided-by-owncloud">
+<h3>Other Syncing options provided by ownCloud<a class="headerlink" href="#other-syncing-options-provided-by-owncloud" title="Permalink to this headline">¶</a></h3>
+<ol class="arabic simple">
+<li>For Android you may use official Android app which can be found <a class="reference external" href="https://owncloud.org/install/">here</a>.</li>
+<li>And for iOS (iPhone and iPad) use their app which can be found <a class="reference external" href="https://owncloud.org/install/">here</a>.</li>
+</ol>
+</div>
+</div>
+<div class="section" id="it-doesn-t-work">
+<h2>It doesn’t work!!!<a class="headerlink" href="#it-doesn-t-work" title="Permalink to this headline">¶</a></h2>
+<p>Are you having problems using the app? Have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/index.html
index f9c6555,0000000..fbfea62
mode 100644,000000..100644
--- a/core/doc/user/pim/index.html
+++ b/core/doc/user/pim/index.html
@@@ -1,170 -1,0 +1,170 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Contacts & Calendar — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="next" title="Using the Contacts App" href="contacts.html" />
+ <link rel="prev" title="Big Files" href="../files/configuring_big_file_upload.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Contacts & Calendar</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="contacts-calendar">
+<h1>Contacts & Calendar<a class="headerlink" href="#contacts-calendar" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<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 Addressbook</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>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_ios.html
index 051ec8d,0000000..d3d498b
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_ios.html
+++ b/core/doc/user/pim/sync_ios.html
@@@ -1,216 -1,0 +1,217 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>iOS - Synchronize iPhone/iPad — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Synchronizing with OS X" href="sync_osx.html" />
+ <link rel="prev" title="Using the Calendar App" href="calendar.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">iOS - Synchronize iPhone/iPad</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#calendar">Calendar</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#address-book">Address book</a></li>
+</ul>
+</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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="ios-synchronize-iphone-ipad">
+<h1>iOS - Synchronize iPhone/iPad<a class="headerlink" href="#ios-synchronize-iphone-ipad" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="calendar">
+<h2>Calendar<a class="headerlink" href="#calendar" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail, Contacts, Calendars.</li>
+<li>Select Add Account.</li>
+<li>Select Other as account type.</li>
+<li>Select Add CalDAV account.</li>
+<li>For server, type <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/caldav/principals/username</span></tt></li>
+<li>Enter your user name and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning will be displayed.
+Select Continue.</li>
+<li>If the iPhone is unable to verify the account information perform the
+following:<ul>
+<li>Select OK.</li>
+<li>Select advanced settings.</li>
+<li>Make sure Use SSL is set to OFF.</li>
+<li>Change port to 80.</li>
+<li>Go back to account information and hit Save.</li>
+</ul>
+</li>
+</ol>
+<p>Your calendar should now be visible in the Calendar application</p>
+</div>
+<div class="section" id="address-book">
+<h2>Address book<a class="headerlink" href="#address-book" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Open the settings application.</li>
+<li>Select Mail, Contacts, Calendars.</li>
+<li>Select Add Account.</li>
+<li>Select Other as account type.</li>
+<li>Select Add CardDAV account.</li>
+<li>For server, type <tt class="docutils literal"><span class="pre">ADDRESS/remote.php/carddav/principals/username</span></tt></li>
+<li>Enter your user name and password.</li>
+<li>Select Next.</li>
+<li>If your server does not support SSL, a warning will be displayed.
+Select Continue.</li>
+<li>If the iPhone is unable to verify the account information perform the
+following:<ul>
+<li>Select OK.</li>
+<li>Select advanced settings.</li>
+<li>Make sure Use SSL is set to OFF.</li>
+<li>Change port to 80.</li>
+<li>Go back to account information and hit Save.</li>
+</ul>
+</li>
+</ol>
+<p>Now should now find your contacts in the address book of your
+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>
++If it’s still not working, have a look at the <a class="reference internal" href="troubleshooting.html"><em>Troubleshooting</em></a> guide.
++.. 6.0 replace:: 6.0</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_kde.html
index 7dc4be2,0000000..b889f26
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_kde.html
+++ b/core/doc/user/pim/sync_kde.html
@@@ -1,184 -1,0 +1,184 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Synchronizing with KDE SC — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Troubleshooting" href="troubleshooting.html" />
+ <link rel="prev" title="Thunderbird - Synchronize Addressbook" href="sync_thunderbird.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <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>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_osx.html
index 6707a9e,0000000..eab0fa8
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_osx.html
+++ b/core/doc/user/pim/sync_osx.html
@@@ -1,196 -1,0 +1,196 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Synchronizing with OS X — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Thunderbird - Synchronize Addressbook" href="sync_thunderbird.html" />
+ <link rel="prev" title="iOS - Synchronize iPhone/iPad" href="sync_ios.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync_ios.html">iOS - Synchronize iPhone/iPad</a></li>
+<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 Addressbook</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="synchronizing-with-os-x">
+<h1>Synchronizing with OS X<a class="headerlink" href="#synchronizing-with-os-x" title="Permalink to this headline">¶</a></h1>
+<p>To use ownCloud with iCal you will need to use the following URL:</p>
+<div class="highlight-python"><pre>http://ADDRESS/remote.php/caldav/principals/username/</pre>
+</div>
+<p>The setup is basically the same as with iOS using the path <strong>ADDRESS/remote.php/caldav/principals/username/</strong> to sync with ownCloud. For OS X 10.7 Lion and 10.8 Mountain Lion everything works fine, but OS X 10.6 (Snow Leopard) and older needs some fiddling to work. A user contributed the following:</p>
+<ol class="arabic">
+<li><p class="first">Make sure, addressbook is not running. If it is, select the windows and press Command + Q to terminate it.</p>
+</li>
+<li><p class="first">Navigate to <strong>/Users/YOUR_USERNAME/Library/Application Support/AddressBook/Sources</strong>. If you have all ready some kind of addressbook setup, it is likely you will see some folders named like this <strong>BEA92826-FBF3-4E53-B5C6-ED7C2B454430</strong>. Note down what folders there are now and leave the window open.</p>
+</li>
+<li><p class="first">Open addressbook and try to add a new CardDav addressbook. At this point, it does not matter what information you enter. It will come up with the same error message you mentioned before when you click “Create”. Ignore it and click “Create” again. A non-functional addressbook will be added.</p>
+</li>
+<li><p class="first">Close addressbook again using Command + Q</p>
+</li>
+<li><p class="first">Go back to the folder window from step 2. You will now see a newly created folder with another long string as its name.</p>
+</li>
+<li><p class="first">Navigate to the newly created folder and edit the <strong>Configuration.plist</strong> with your favorite text editor.</p>
+</li>
+<li><p class="first">Search for a section looking like this:</p>
+<div class="highlight-python"><pre><key>servername</key> <string>http://:0(null)</string> <key>username</key> <string>Whatever_you_entered_before</string></pre>
+</div>
+</li>
+</ol>
+<ol class="arabic" start="8">
+<li><p class="first">Make it look like this. Please note that the :80 after <strong>YOUR_DOMAIN</strong> is important:</p>
+<div class="highlight-python"><pre><key>servername</key <string>http://YOUR_DOMAIN:80/owncloud/remote.php/carddav/principals/username</string> <key>username</key <string>username</string></pre>
+</div>
+</li>
+<li><p class="first">Save the file and open addressbook again. It will not work yet.</p>
+</li>
+<li><p class="first">Open the preferences for your ownCloud CardDAV-Account and enter your password.</p>
+</li>
+<li><p class="first">You may have to restart addressbook 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>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/sync_thunderbird.html
index ea1eeb2,0000000..e67791b
mode 100644,000000..100644
--- a/core/doc/user/pim/sync_thunderbird.html
+++ b/core/doc/user/pim/sync_thunderbird.html
@@@ -1,190 -1,0 +1,190 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Thunderbird - Synchronize Addressbook — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="../index.html" />
+ <link rel="up" title="Contacts & Calendar" href="index.html" />
+ <link rel="next" title="Synchronizing with KDE SC" href="sync_kde.html" />
+ <link rel="prev" title="Synchronizing with OS X" href="sync_osx.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<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 current"><a class="current reference internal" href="">Thunderbird - Synchronize Addressbook</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#addressbook">Addressbook</a></li>
+</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>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="thunderbird-synchronize-addressbook">
+<h1>Thunderbird - Synchronize Addressbook<a class="headerlink" href="#thunderbird-synchronize-addressbook" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="addressbook">
+<h2>Addressbook<a class="headerlink" href="#addressbook" title="Permalink to this headline">¶</a></h2>
+<p>As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird Addressbook... here is what you need in excruciating pithy detail you need to make this work (for all the other lost souls out there):</p>
+<ol class="arabic simple">
+<li><a class="reference external" href="http://www.mozilla.org/en-US/thunderbird/">Thunderbird</a> for your OS unless it comes with your OS distribution (Linux)</li>
+<li><a class="reference external" href="http://www.sogo.nu/english/downloads/frontends.html">Sogo Connector</a> (latest release)</li>
+</ol>
+<blockquote>
+<div>With an installed Thunderbird mailtool, and installed SoGo Connector:</div></blockquote>
+<ol class="arabic simple">
+<li>Thunderbird Addressbook is in the Thunderbird “Tools” Menu</li>
+<li>In the Thunderbird Addressbook application:<ul>
+<li>“File > New > <strong>Remote Addressbook</strong>” (SoGo Connector added this)</li>
+<li>“<strong>Name:</strong>” is the name you want to give your Addressbook in the Thunderbird addressbook bar area</li>
+<li>“<strong>URL:</strong>” is found in your OwnCloud Contacts area, that little Gear symbol</li>
+</ul>
+</li>
+</ol>
+<img alt="../_images/contact_thunderbird-Symbol_Gear.jpg" src="../_images/contact_thunderbird-Symbol_Gear.jpg" />
+<p>in the -bottom left- of the Contacts View (same symbol as found in the -top right- in the Calendar view). Then look for a little impeller symbol</p>
+<img alt="../_images/contact_thunderbird-Symbol_Impeller.jpg" src="../_images/contact_thunderbird-Symbol_Impeller.jpg" />
+<p>which will display the URL you need for your installation to work.</p>
+<img alt="../_images/contact_thunderbird-URL_config.jpg" src="../_images/contact_thunderbird-URL_config.jpg" />
+<p>Once installed, synchronize (right click on your newly made remote addressbook and select “Synchronize”). You’ll see your addressbook populate from ownCloud! Don’t click “read only” above unless you don’t want to modify your ownCloud server addressbook, like it contains a listing of corporate contacts and is shared with lots of people, and you don’t want a new user dragging it somewhere unintended.</p>
+<p>The rest of the details of dealing with Thunderbird addressbook are left to the reader... First thing I learned is dragging a contact to a different addressbook is a “move” operation. If you are worried about losing the contact, save it to a VCF file using ownCloud (Or LDIF using Thunderbird Addressbook) first! Like dragging from “ownCloud Addressbook” to “Personal Address Book” removes the contact from ownCloud Server (<em>deleting it from all the [...]
+<p>Contact <em>Pictures</em> are also sync’ed!</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/pim/troubleshooting.html
index 6d3400f,0000000..0f83a5a
mode 100644,000000..100644
--- a/core/doc/user/pim/troubleshooting.html
+++ b/core/doc/user/pim/troubleshooting.html
@@@ -1,234 -1,0 +1,234 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Troubleshooting — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.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="Synchronizing with KDE SC" href="sync_kde.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="../index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Contacts & Calendar</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="contacts.html">Using the Contacts App</a></li>
+<li class="toctree-l2"><a class="reference internal" href="calendar.html">Using the Calendar App</a></li>
+<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 Addressbook</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="#debugging-the-issue">Debugging the issue</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#service-discovery">Service discovery</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#unable-to-update-contacts-or-events">Unable to update Contacts or Events</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="troubleshooting">
+<h1>Troubleshooting<a class="headerlink" href="#troubleshooting" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="debugging-the-issue">
+<h2>Debugging the issue<a class="headerlink" href="#debugging-the-issue" title="Permalink to this headline">¶</a></h2>
+<p>In a standard ownCloud installation the log level is set to “Normal”. to find any issues
+you need to raise the log level to “All” from the Admin page.
+Some logging - for example JavaScript console logging - needs manually editing the
+configuration file.
+Edit <tt class="file docutils literal"><span class="pre">config/config.php</span></tt> and add <tt class="docutils literal"><span class="pre">define('DEBUG',</span> <span class="pre">true);</span></tt>:</p>
+<div class="highlight-python"><pre><?php
+define('DEBUG',true);
+$CONFIG = array (
+ ... configuration goes here ...
+);</pre>
+</div>
+<p>For JavaScript issues you will also need to view the javascript console. All major browsers
+have decent developer tools for viewing the console, and you usually access them by
+pressing F-12. For Firefox it is recommended to install the <a class="reference external" href="https://getfirebug.com/">Firebug extension</a>.</p>
+</div>
+<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>
+<div class="section" id="apple-ios">
+<h3>Apple iOS<a class="headerlink" href="#apple-ios" title="Permalink to this headline">¶</a></h3>
+<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 class="section" id="blackberry-os-10-2">
+<h3>BlackBerry OS 10.2<a class="headerlink" href="#blackberry-os-10-2" title="Permalink to this headline">¶</a></h3>
+<p>BlackBerry OS up to 10.2.2102 doesn’t accept a URL with protocol <tt class="docutils literal"><span class="pre">https://</span></tt> in front of the server address.
+It will always tell you, that it cannot login on your server. So instead of writing</p>
+<blockquote>
+<div><a class="reference external" href="https://address/remote.php/carddav/principals/username">https://address/remote.php/carddav/principals/username</a></div></blockquote>
+<p>in the server address field, you have to write</p>
+<blockquote>
+<div>address/remote.php/carddav/principals/username</div></blockquote>
+</div>
+</div>
+<div class="section" id="unable-to-update-contacts-or-events">
+<h2>Unable to update Contacts or Events<a class="headerlink" href="#unable-to-update-contacts-or-events" title="Permalink to this headline">¶</a></h2>
+<p>If you get an error like <tt class="docutils literal"><span class="pre">PATCH</span> <span class="pre">https://ADDRESS/some_url</span> <span class="pre">HTTP/1.0</span> <span class="pre">501</span> <span class="pre">Not</span> <span class="pre">Implemented</span></tt> it is
+likely caused by one of the following reasons:</p>
+<dl class="docutils">
+<dt>Outdated lighttpd web server</dt>
+<dd>lighttpd in debian wheezy (1.4.31) doesn’t support the PATCH HTTP verb.
+Upgrade to lighttpd >= 1.4.33.</dd>
+<dt>Using Pound reverse-proxy/load balancer</dt>
+<dd>As of writing this Pound doesn’t support the HTTP/1.1 verb.
+Pound is easily <a class="reference external" href="http://www.apsis.ch/pound/pound_list/archive/2013/2013-08/1377264673000">patched</a> to support HTTP/1.1.</dd>
+</dl>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/search.html
index 3f26308,0000000..e792a6d
mode 100644,000000..100644
--- a/core/doc/user/search.html
+++ b/core/doc/user/search.html
@@@ -1,173 -1,0 +1,173 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Search — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/searchtools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <script type="text/javascript">
+ jQuery(function() { Search.loadIndex("searchindex.js"); });
+ </script>
+
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <h1 id="search-documentation">Search</h1>
+ <div id="fallback" class="admonition warning">
+ <script type="text/javascript">$('#fallback').hide();</script>
+ <p>
+ Please activate JavaScript to enable the search
+ functionality.
+ </p>
+ </div>
+ <p>
+ From here you can search these documents. Enter your search
+ words into the box below and click "search". Note that the search
+ function will automatically search for all of the words. Pages
+ containing fewer words won't appear in the result list.
+ </p>
+ <form action="" method="get">
+ <input type="text" name="q" value="" />
+ <input type="submit" value="search" />
+ <span id="search-progress" style="padding-left: 10px"></span>
+ </form>
+
+ <div id="search-results">
+
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/userpreferences.html
index c381c99,0000000..0493ad5
mode 100644,000000..100644
--- a/core/doc/user/userpreferences.html
+++ b/core/doc/user/userpreferences.html
@@@ -1,172 -1,0 +1,172 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Changing Preferences — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <link rel="next" title="External storage" href="external_storage/google_drive.html" />
+ <link rel="prev" title="User Account Migration" href="migration.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="changing-preferences">
+<h1>Changing Preferences<a class="headerlink" href="#changing-preferences" title="Permalink to this headline">¶</a></h1>
+<div class="figure">
+<img alt="_images/oc_user_preferences.png" src="_images/oc_user_preferences.png" />
+</div>
+<p>As a user, you can change your personal settings by clicking on your username
+on the top-right of ownCloud instance and choosing <em>Personal</em>.</p>
+<p>If you are an administrator, you can also manage users and administer the server
+by using the related links. Those links will not be shown to a normal user.</p>
+<p>This document will explain the default items on this page. Depending on the enabled
+applications, you may have more options listed.</p>
+<ul class="simple">
+<li>In the beginning of the page, you will see your usage and available quota.</li>
+<li>You can change your password. For that, you need to enter your current and new password in the field
+named <em>Password</em>. If you would like to able to recover your password via e-mail, fill the e-mail field
+with the one that you currently using.</li>
+<li>By default, your image will have the initial of your username. This image is currently used in editing documents.
+You can either upload a new image or choose one from the existing images on your ownCloud to set.</li>
+<li>In this page, you can also change your web interface language if you want to override the browser settings.</li>
+<li>WebDAV link will allow you to only view and download your ownCloud files using a browser. You will still need
+your username and password to access this page.</li>
+<li>Documents app will have an option to specify the folder for newly created documents. You can set the folder here.</li>
+<li>This page will have more options if you have e.g. external storage app enabled.</li>
+</ul>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/webinterface.html
index d12229d,0000000..c01d1b7
mode 100644,000000..100644
--- a/core/doc/user/webinterface.html
+++ b/core/doc/user/webinterface.html
@@@ -1,200 -1,0 +1,200 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>The ownCloud Web Interface — ownCloud User Manual 6.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" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '6.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 6.0 documentation" href="index.html" />
+ <link rel="next" title="Files & Synchronization" href="files/index.html" />
- <link rel="prev" title="User Documentation" href="index.html" />
++ <link rel="prev" title="ownCloud 6.0 User Documentation" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
- <li class="toctree-l1"><a class="reference internal" href="index.html">User Documentation</a></li>
++<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 6.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#overview">Overview</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">External storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="the-owncloud-web-interface">
+<h1>The ownCloud Web Interface<a class="headerlink" href="#the-owncloud-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can connect to ownCloud with your web browser by pointing
+it to the address that you have received from your service
+provider. In case you are administering the server yourself,
+have a look at <a class="reference external" href="http://doc.owncloud.org/server/6.0/admin_manual/">ownCloud Administrators Manual</a>.</p>
+<p>When you enter the URL, you will receive a page that is similar
+to the one depicted below:</p>
+<div class="figure">
+<img alt="_images/oc_connect.png" src="_images/oc_connect.png" />
+<p class="caption">The ownCloud login screen</p>
+</div>
+<p>Login with the user name and password with you have received from
+your service provider. If you have set up the server yourself,
+log in with the user name which you have created during the
+setup process. You can add further users through the settings,
+or by hooking up a user backend, such as LDAP.</p>
+<div class="section" id="overview">
+<h2>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
+<p>After clicking the <em class="guilabel">Log in</em> button, you will be redirected
+to ownCloud’s main web interface:</p>
+<div class="figure align-center">
+<img alt="_images/oc_ui.png" src="_images/oc_ui.png" />
+<p class="caption">The ownCloud main interface with the essential elements numbered</p>
+</div>
+<p>The web interface comprises of the following items:</p>
+<ol class="arabic simple">
+<li><strong>Navigation bar</strong>: Allows navigation between different parts of ownCloud,
+provided by apps. Not all apps depicted in this screenshot are installed
+and enabled by default.</li>
+<li><strong>Application view</strong>: This is where apps show their content. By default, this
+will show the files and directory (file view) of your user on the ownCloud
+installation.</li>
+<li><strong>New/Upload button</strong>: This allows you to create new files or upload
+existing ones from your device. Note that you can also drop files from
+Explorer or Finder onto the ownCloud file view and they will get uploaded to
+ownCloud. With <em>New</em> button, you can create a text file, folder or download
+a file from the provided URL.</li>
+<li><strong>Search/Settings</strong>: Search allows you to look for files and
+directories. Currently, ownCloud provides a full text search. If full text seach does
+not work, administrators need to enable this app from app settings.
+Settings menu provides access to the settings menu, where you can
+change your personal settings, such as the interface language or your
+password. You can also retrieve the WebDAV URL (see next chapter) and show
+your quota. Administrators will also get access to user management
+(<em class="guilabel">Users</em>), the apps settings (<em class="guilabel">Apps</em>) and administrative settings (<em class="guilabel">Admin</em>) including access to ownCloud’s log. You will also find logout button in this menu.</li>
+<li><strong>Apps</strong>: This button is only visible to administrators. Using this button allows administrators to enable/disable apps.</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/skeleton/ownCloudUserManual.pdf
index 858b710,0000000..00e436f
mode 100644,000000..100644
Binary files differ
diff --cc lib/private/user.php
index 992e4a2,c652468..c652468
mode 100644,100755..100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
diff --cc version.php
index 106f1fa,9e2fe43..e84bbde
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,17 +1,6 @@@
-<?php
-
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
-$OC_Version=array(6, 0, 2, 2);
-
-// The human readable string
-$OC_VersionString='6.0.2';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(6,0,2,0);
- $OC_VersionString = '6.0.2 RC1';
++$OC_Version = array(6,0,2,2);
++$OC_VersionString = '6.0.2';
+$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-02-25T14:53:49+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-03-03T14:12:38+00:00';
--
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