185 files changed, 95 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 71e3ec1baf9..71e3ec1baf9 100755..100644
--- a/.gitignore
+++ b/.gitignore
diff --git a/README b/README
index fe25ece40ec..fe25ece40ec 100755..100644
--- a/README
+++ b/README
diff --git a/TODO b/TODO
new file mode 100644
index 00000000000..1165ed7e72a
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+Database:
+    - Stored procedures!
diff --git a/admin/index.php b/admin/index.php
index 2331c22f062..2331c22f062 100755..100644
--- a/admin/index.php
+++ b/admin/index.php
diff --git a/config/.gitignore b/config/.gitignore
index d09f42a2389..d09f42a2389 100755..100644
--- a/config/.gitignore
+++ b/config/.gitignore
diff --git a/config/config.sample.php b/config/config.sample.php
index dc1a62f46e3..dc1a62f46e3 100755..100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
diff --git a/css/default.php b/css/default.php
index 6500b31cb6d..6500b31cb6d 100755..100644
--- a/css/default.php
+++ b/css/default.php
diff --git a/css/small.php b/css/small.php
index 60f79f51be1..60f79f51be1 100755..100644
--- a/css/small.php
+++ b/css/small.php
diff --git a/db_structure.xml b/db_structure.xml
index 7efb722bd72..51ab9210933 100755..100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -8,6 +8,37 @@
  <charset>latin1</charset>
 
  <table>
+   <name>*dbprefix*privatedata</name>
+   <declaration>
+     <field>
+       <name>key</name>
+       <type>text</type>
+       <default></default>
+       <notnull>true</notnull>
+       <length>64</length>
+     </field>
+     <field>
+       <name>value</name>
+       <type>text</type>
+       <notnull>false</notnull>
+     </field>
+     <field>
+       <name>timestamp</name>
+       <type>timestamp</type>
+       <notnull>true</notnull>
+     </field>
+     <index>
+       <name>timestamp</name>
+       <unique>false</unique>
+       <field>
+         <name>timestamp</name>
+         <sorting>ascending</sorting>
+       </field>
+     </index>
+   </declaration>
+ </table>
+
+ <table>
 
   <name>*dbprefix*groups</name>
 
diff --git a/docs/FAQs b/docs/FAQs
index f1e6149c48c..f1e6149c48c 100755..100644
--- a/docs/FAQs
+++ b/docs/FAQs
diff --git a/docs/INSTALL b/docs/INSTALL
index 970af77574c..970af77574c 100755..100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
diff --git a/docs/TODO b/docs/TODO
index 0bbca7c2dab..0bbca7c2dab 100755..100644
--- a/docs/TODO
+++ b/docs/TODO
diff --git a/docs/owncloud.sql b/docs/owncloud.sql
index 94e500bf004..94e500bf004 100755..100644
--- a/docs/owncloud.sql
+++ b/docs/owncloud.sql
diff --git a/files/api.php b/files/api.php
index d6e04d4550f..d6e04d4550f 100755..100644
--- a/files/api.php
+++ b/files/api.php
diff --git a/files/get_files.php b/files/get_files.php
index 1481bb6f84b..1481bb6f84b 100755..100644
--- a/files/get_files.php
+++ b/files/get_files.php
diff --git a/files/index.php b/files/index.php
index 6bd994e7616..6bd994e7616 100755..100644
--- a/files/index.php
+++ b/files/index.php
diff --git a/files/open_file.php b/files/open_file.php
index e1b82dcd37b..e1b82dcd37b 100755..100644
--- a/files/open_file.php
+++ b/files/open_file.php
diff --git a/files/upload.php b/files/upload.php
index 1190b466eac..1190b466eac 100755..100644
--- a/files/upload.php
+++ b/files/upload.php
diff --git a/img/arrow.png b/img/arrow.png
index 2d64bbdb7e6..2d64bbdb7e6 100755..100644
--- a/img/arrow.png
+++ b/img/arrow.png
diff --git a/img/arrow_down.png b/img/arrow_down.png
index ecbca6ef606..ecbca6ef606 100755..100644
--- a/img/arrow_down.png
+++ b/img/arrow_down.png
diff --git a/img/arrow_up.png b/img/arrow_up.png
index e2457c88838..e2457c88838 100755..100644
--- a/img/arrow_up.png
+++ b/img/arrow_up.png
diff --git a/img/dots.png b/img/dots.png
index 5a98627cf5f..5a98627cf5f 100755..100644
--- a/img/dots.png
+++ b/img/dots.png
diff --git a/img/icons/delete.png b/img/icons/delete.png
index d04a554ee17..d04a554ee17 100755..100644
--- a/img/icons/delete.png
+++ b/img/icons/delete.png
diff --git a/img/icons/folder.png b/img/icons/folder.png
index 536da3d1c39..536da3d1c39 100755..100644
--- a/img/icons/folder.png
+++ b/img/icons/folder.png
diff --git a/img/icons/loading.gif b/img/icons/loading.gif
index 40efb9be594..40efb9be594 100755..100644
--- a/img/icons/loading.gif
+++ b/img/icons/loading.gif
diff --git a/img/icons/other.png b/img/icons/other.png
index 98a0a42dc1e..98a0a42dc1e 100755..100644
--- a/img/icons/other.png
+++ b/img/icons/other.png
diff --git a/img/icons/rename.png b/img/icons/rename.png
index 2323757e0e9..2323757e0e9 100755..100644
--- a/img/icons/rename.png
+++ b/img/icons/rename.png
diff --git a/img/owncloud-icon.png b/img/owncloud-icon.png
index af123f0cd52..af123f0cd52 100755..100644
--- a/img/owncloud-icon.png
+++ b/img/owncloud-icon.png
diff --git a/img/owncloud-logo-small.png b/img/owncloud-logo-small.png
index 62dff2559bb..62dff2559bb 100755..100644
--- a/img/owncloud-logo-small.png
+++ b/img/owncloud-logo-small.png
diff --git a/img/owncloud-logo.png b/img/owncloud-logo.png
index 4f42e4b8fb9..4f42e4b8fb9 100755..100644
--- a/img/owncloud-logo.png
+++ b/img/owncloud-logo.png
diff --git a/inc/Archive/Tar.php b/inc/Archive/Tar.php
index d6e6e29350e..d6e6e29350e 100755..100644
--- a/inc/Archive/Tar.php
+++ b/inc/Archive/Tar.php
diff --git a/inc/Console/Getopt.php b/inc/Console/Getopt.php
index 6f2f9c73079..6f2f9c73079 100755..100644
--- a/inc/Console/Getopt.php
+++ b/inc/Console/Getopt.php
diff --git a/inc/HTTP/WebDAV/Server.php b/inc/HTTP/WebDAV/Server.php
index c407d74c89f..c407d74c89f 100755..100644
--- a/inc/HTTP/WebDAV/Server.php
+++ b/inc/HTTP/WebDAV/Server.php
diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php
index ea0625a5a1e..ea0625a5a1e 100755..100644
--- a/inc/HTTP/WebDAV/Server/Filesystem.php
+++ b/inc/HTTP/WebDAV/Server/Filesystem.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php b/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
index 6319f0d5200..6319f0d5200 100755..100644
--- a/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_propfind.php b/inc/HTTP/WebDAV/Tools/_parse_propfind.php
index cf72b529d97..cf72b529d97 100755..100644
--- a/inc/HTTP/WebDAV/Tools/_parse_propfind.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_propfind.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_proppatch.php b/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
index fb0e595ddf7..fb0e595ddf7 100755..100644
--- a/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
diff --git a/inc/Log.php b/inc/Log.php
index 8f084640bc9..8f084640bc9 100755..100644
--- a/inc/Log.php
+++ b/inc/Log.php
diff --git a/inc/Log/composite.php b/inc/Log/composite.php
index 104c8966c42..104c8966c42 100755..100644
--- a/inc/Log/composite.php
+++ b/inc/Log/composite.php
diff --git a/inc/Log/console.php b/inc/Log/console.php
index 62032e79644..62032e79644 100755..100644
--- a/inc/Log/console.php
+++ b/inc/Log/console.php
diff --git a/inc/Log/daemon.php b/inc/Log/daemon.php
index 739270c9a32..739270c9a32 100755..100644
--- a/inc/Log/daemon.php
+++ b/inc/Log/daemon.php
diff --git a/inc/Log/display.php b/inc/Log/display.php
index 0d5a93d79da..0d5a93d79da 100755..100644
--- a/inc/Log/display.php
+++ b/inc/Log/display.php
diff --git a/inc/Log/error_log.php b/inc/Log/error_log.php
index 04c0952cd7a..04c0952cd7a 100755..100644
--- a/inc/Log/error_log.php
+++ b/inc/Log/error_log.php
diff --git a/inc/Log/file.php b/inc/Log/file.php
index 36f30b42978..36f30b42978 100755..100644
--- a/inc/Log/file.php
+++ b/inc/Log/file.php
diff --git a/inc/Log/mail.php b/inc/Log/mail.php
index 064f13c0ed5..064f13c0ed5 100755..100644
--- a/inc/Log/mail.php
+++ b/inc/Log/mail.php
diff --git a/inc/Log/mcal.php b/inc/Log/mcal.php
index a5c46f3dfc6..a5c46f3dfc6 100755..100644
--- a/inc/Log/mcal.php
+++ b/inc/Log/mcal.php
diff --git a/inc/Log/null.php b/inc/Log/null.php
index 23de3f1a9e5..23de3f1a9e5 100755..100644
--- a/inc/Log/null.php
+++ b/inc/Log/null.php
diff --git a/inc/Log/observer.php b/inc/Log/observer.php
index 187d5070f74..187d5070f74 100755..100644
--- a/inc/Log/observer.php
+++ b/inc/Log/observer.php
diff --git a/inc/Log/sql.php b/inc/Log/sql.php
index 3a20a0e2faf..3a20a0e2faf 100755..100644
--- a/inc/Log/sql.php
+++ b/inc/Log/sql.php
diff --git a/inc/Log/sqlite.php b/inc/Log/sqlite.php
index 83b908a9396..83b908a9396 100755..100644
--- a/inc/Log/sqlite.php
+++ b/inc/Log/sqlite.php
diff --git a/inc/Log/syslog.php b/inc/Log/syslog.php
index 4bafbaa2d9a..4bafbaa2d9a 100755..100644
--- a/inc/Log/syslog.php
+++ b/inc/Log/syslog.php
diff --git a/inc/Log/win.php b/inc/Log/win.php
index e8a09d16e81..e8a09d16e81 100755..100644
--- a/inc/Log/win.php
+++ b/inc/Log/win.php
diff --git a/inc/MDB2.php b/inc/MDB2.php
index aa4259b9db7..aa4259b9db7 100755..100644
--- a/inc/MDB2.php
+++ b/inc/MDB2.php
diff --git a/inc/MDB2/Date.php b/inc/MDB2/Date.php
index ce846543a50..ce846543a50 100755..100644
--- a/inc/MDB2/Date.php
+++ b/inc/MDB2/Date.php
diff --git a/inc/MDB2/Driver/Datatype/Common.php b/inc/MDB2/Driver/Datatype/Common.php
index 750dbb24772..750dbb24772 100755..100644
--- a/inc/MDB2/Driver/Datatype/Common.php
+++ b/inc/MDB2/Driver/Datatype/Common.php
diff --git a/inc/MDB2/Driver/Datatype/mysql.php b/inc/MDB2/Driver/Datatype/mysql.php
index 944248f57c3..944248f57c3 100755..100644
--- a/inc/MDB2/Driver/Datatype/mysql.php
+++ b/inc/MDB2/Driver/Datatype/mysql.php
diff --git a/inc/MDB2/Driver/Datatype/pgsql.php b/inc/MDB2/Driver/Datatype/pgsql.php
index fe18729c84f..fe18729c84f 100755..100644
--- a/inc/MDB2/Driver/Datatype/pgsql.php
+++ b/inc/MDB2/Driver/Datatype/pgsql.php
diff --git a/inc/MDB2/Driver/Datatype/sqlite.php b/inc/MDB2/Driver/Datatype/sqlite.php
index 533d0e9510b..533d0e9510b 100755..100644
--- a/inc/MDB2/Driver/Datatype/sqlite.php
+++ b/inc/MDB2/Driver/Datatype/sqlite.php
diff --git a/inc/MDB2/Driver/Function/Common.php b/inc/MDB2/Driver/Function/Common.php
index 731f06882ce..731f06882ce 100755..100644
--- a/inc/MDB2/Driver/Function/Common.php
+++ b/inc/MDB2/Driver/Function/Common.php
diff --git a/inc/MDB2/Driver/Function/mysql.php b/inc/MDB2/Driver/Function/mysql.php
index aff531c9f3a..aff531c9f3a 100755..100644
--- a/inc/MDB2/Driver/Function/mysql.php
+++ b/inc/MDB2/Driver/Function/mysql.php
diff --git a/inc/MDB2/Driver/Function/pgsql.php b/inc/MDB2/Driver/Function/pgsql.php
index cb47ea57d9f..cb47ea57d9f 100755..100644
--- a/inc/MDB2/Driver/Function/pgsql.php
+++ b/inc/MDB2/Driver/Function/pgsql.php
diff --git a/inc/MDB2/Driver/Function/sqlite.php b/inc/MDB2/Driver/Function/sqlite.php
index f5499599dd5..f5499599dd5 100755..100644
--- a/inc/MDB2/Driver/Function/sqlite.php
+++ b/inc/MDB2/Driver/Function/sqlite.php
diff --git a/inc/MDB2/Driver/Manager/Common.php b/inc/MDB2/Driver/Manager/Common.php
index d7154d4eac0..d7154d4eac0 100755..100644
--- a/inc/MDB2/Driver/Manager/Common.php
+++ b/inc/MDB2/Driver/Manager/Common.php
diff --git a/inc/MDB2/Driver/Manager/mysql.php b/inc/MDB2/Driver/Manager/mysql.php
index 7bd6a3623a3..7bd6a3623a3 100755..100644
--- a/inc/MDB2/Driver/Manager/mysql.php
+++ b/inc/MDB2/Driver/Manager/mysql.php
diff --git a/inc/MDB2/Driver/Manager/pgsql.php b/inc/MDB2/Driver/Manager/pgsql.php
index 1a7e851897c..1a7e851897c 100755..100644
--- a/inc/MDB2/Driver/Manager/pgsql.php
+++ b/inc/MDB2/Driver/Manager/pgsql.php
diff --git a/inc/MDB2/Driver/Manager/sqlite.php b/inc/MDB2/Driver/Manager/sqlite.php
index 85751d39a3f..85751d39a3f 100755..100644
--- a/inc/MDB2/Driver/Manager/sqlite.php
+++ b/inc/MDB2/Driver/Manager/sqlite.php
diff --git a/inc/MDB2/Driver/Native/Common.php b/inc/MDB2/Driver/Native/Common.php
index c01caa35b71..c01caa35b71 100755..100644
--- a/inc/MDB2/Driver/Native/Common.php
+++ b/inc/MDB2/Driver/Native/Common.php
diff --git a/inc/MDB2/Driver/Native/mysql.php b/inc/MDB2/Driver/Native/mysql.php
index 90ff068e6ff..90ff068e6ff 100755..100644
--- a/inc/MDB2/Driver/Native/mysql.php
+++ b/inc/MDB2/Driver/Native/mysql.php
diff --git a/inc/MDB2/Driver/Native/pgsql.php b/inc/MDB2/Driver/Native/pgsql.php
index acab8389c89..acab8389c89 100755..100644
--- a/inc/MDB2/Driver/Native/pgsql.php
+++ b/inc/MDB2/Driver/Native/pgsql.php
diff --git a/inc/MDB2/Driver/Native/sqlite.php b/inc/MDB2/Driver/Native/sqlite.php
index 0213293a50a..0213293a50a 100755..100644
--- a/inc/MDB2/Driver/Native/sqlite.php
+++ b/inc/MDB2/Driver/Native/sqlite.php
diff --git a/inc/MDB2/Driver/Reverse/Common.php b/inc/MDB2/Driver/Reverse/Common.php
index 4a411fea6d2..4a411fea6d2 100755..100644
--- a/inc/MDB2/Driver/Reverse/Common.php
+++ b/inc/MDB2/Driver/Reverse/Common.php
diff --git a/inc/MDB2/Driver/Reverse/mysql.php b/inc/MDB2/Driver/Reverse/mysql.php
index 40c62da3baa..40c62da3baa 100755..100644
--- a/inc/MDB2/Driver/Reverse/mysql.php
+++ b/inc/MDB2/Driver/Reverse/mysql.php
diff --git a/inc/MDB2/Driver/Reverse/pgsql.php b/inc/MDB2/Driver/Reverse/pgsql.php
index d010292cd8c..d010292cd8c 100755..100644
--- a/inc/MDB2/Driver/Reverse/pgsql.php
+++ b/inc/MDB2/Driver/Reverse/pgsql.php
diff --git a/inc/MDB2/Driver/Reverse/sqlite.php b/inc/MDB2/Driver/Reverse/sqlite.php
index 1b85aa71f9a..1b85aa71f9a 100755..100644
--- a/inc/MDB2/Driver/Reverse/sqlite.php
+++ b/inc/MDB2/Driver/Reverse/sqlite.php
diff --git a/inc/MDB2/Driver/mysql.php b/inc/MDB2/Driver/mysql.php
index 091c479d194..091c479d194 100755..100644
--- a/inc/MDB2/Driver/mysql.php
+++ b/inc/MDB2/Driver/mysql.php
diff --git a/inc/MDB2/Driver/pgsql.php b/inc/MDB2/Driver/pgsql.php
index 00a64865a72..00a64865a72 100755..100644
--- a/inc/MDB2/Driver/pgsql.php
+++ b/inc/MDB2/Driver/pgsql.php
diff --git a/inc/MDB2/Driver/sqlite.php b/inc/MDB2/Driver/sqlite.php
index 63b66bf3fb9..63b66bf3fb9 100755..100644
--- a/inc/MDB2/Driver/sqlite.php
+++ b/inc/MDB2/Driver/sqlite.php
diff --git a/inc/MDB2/Extended.php b/inc/MDB2/Extended.php
index 864ab923543..864ab923543 100755..100644
--- a/inc/MDB2/Extended.php
+++ b/inc/MDB2/Extended.php
diff --git a/inc/MDB2/Iterator.php b/inc/MDB2/Iterator.php
index ca5e7b69c27..ca5e7b69c27 100755..100644
--- a/inc/MDB2/Iterator.php
+++ b/inc/MDB2/Iterator.php
diff --git a/inc/MDB2/LOB.php b/inc/MDB2/LOB.php
index 2cdf67afa92..2cdf67afa92 100755..100644
--- a/inc/MDB2/LOB.php
+++ b/inc/MDB2/LOB.php
diff --git a/inc/Mail.php b/inc/Mail.php
index c9f480fd488..c9f480fd488 100755..100644
--- a/inc/Mail.php
+++ b/inc/Mail.php
diff --git a/inc/Mail/RFC822.php b/inc/Mail/RFC822.php
index 47e84f83b26..47e84f83b26 100755..100644
--- a/inc/Mail/RFC822.php
+++ b/inc/Mail/RFC822.php
diff --git a/inc/Mail/mail.php b/inc/Mail/mail.php
index 9135fa2363b..9135fa2363b 100755..100644
--- a/inc/Mail/mail.php
+++ b/inc/Mail/mail.php
diff --git a/inc/Mail/mime.php b/inc/Mail/mime.php
index 302a2120d78..302a2120d78 100755..100644
--- a/inc/Mail/mime.php
+++ b/inc/Mail/mime.php
diff --git a/inc/Mail/mimeDecode.php b/inc/Mail/mimeDecode.php
index d5187d9b7aa..d5187d9b7aa 100755..100644
--- a/inc/Mail/mimeDecode.php
+++ b/inc/Mail/mimeDecode.php
diff --git a/inc/Mail/mimePart.php b/inc/Mail/mimePart.php
index c0050d41127..c0050d41127 100755..100644
--- a/inc/Mail/mimePart.php
+++ b/inc/Mail/mimePart.php
diff --git a/inc/Mail/null.php b/inc/Mail/null.php
index 982bfa45b6d..982bfa45b6d 100755..100644
--- a/inc/Mail/null.php
+++ b/inc/Mail/null.php
diff --git a/inc/Mail/sendmail.php b/inc/Mail/sendmail.php
index 39a43c25062..39a43c25062 100755..100644
--- a/inc/Mail/sendmail.php
+++ b/inc/Mail/sendmail.php
diff --git a/inc/Mail/smtp.php b/inc/Mail/smtp.php
index 40686a61689..40686a61689 100755..100644
--- a/inc/Mail/smtp.php
+++ b/inc/Mail/smtp.php
diff --git a/inc/Mail/xmail.dtd b/inc/Mail/xmail.dtd
index 9f42ca8b331..9f42ca8b331 100755..100644
--- a/inc/Mail/xmail.dtd
+++ b/inc/Mail/xmail.dtd
diff --git a/inc/Mail/xmail.xsl b/inc/Mail/xmail.xsl
index 0b948913f84..0b948913f84 100755..100644
--- a/inc/Mail/xmail.xsl
+++ b/inc/Mail/xmail.xsl
diff --git a/inc/Net/SMTP.php b/inc/Net/SMTP.php
index 71dcb5e9bef..71dcb5e9bef 100755..100644
--- a/inc/Net/SMTP.php
+++ b/inc/Net/SMTP.php
diff --git a/inc/Net/Socket.php b/inc/Net/Socket.php
index 7c4ff1d4e21..7c4ff1d4e21 100755..100644
--- a/inc/Net/Socket.php
+++ b/inc/Net/Socket.php
diff --git a/inc/OS/Guess.php b/inc/OS/Guess.php
index a85bf360ebc..a85bf360ebc 100755..100644
--- a/inc/OS/Guess.php
+++ b/inc/OS/Guess.php
diff --git a/inc/PEAR.php b/inc/PEAR.php
index d5c9635a501..d5c9635a501 100755..100644
--- a/inc/PEAR.php
+++ b/inc/PEAR.php
diff --git a/inc/PEAR/Autoloader.php b/inc/PEAR/Autoloader.php
index de0278d6191..de0278d6191 100755..100644
--- a/inc/PEAR/Autoloader.php
+++ b/inc/PEAR/Autoloader.php
diff --git a/inc/PEAR/Builder.php b/inc/PEAR/Builder.php
index 4f6cc135d1e..4f6cc135d1e 100755..100644
--- a/inc/PEAR/Builder.php
+++ b/inc/PEAR/Builder.php
diff --git a/inc/PEAR/Command.php b/inc/PEAR/Command.php
index 2ea68743d20..2ea68743d20 100755..100644
--- a/inc/PEAR/Command.php
+++ b/inc/PEAR/Command.php
diff --git a/inc/PEAR/Command/Auth.php b/inc/PEAR/Command/Auth.php
index 0b9d3d3965d..0b9d3d3965d 100755..100644
--- a/inc/PEAR/Command/Auth.php
+++ b/inc/PEAR/Command/Auth.php
diff --git a/inc/PEAR/Command/Build.php b/inc/PEAR/Command/Build.php
index 2ecbbc92f5f..2ecbbc92f5f 100755..100644
--- a/inc/PEAR/Command/Build.php
+++ b/inc/PEAR/Command/Build.php
diff --git a/inc/PEAR/Command/Common.php b/inc/PEAR/Command/Common.php
index c6ace694caf..c6ace694caf 100755..100644
--- a/inc/PEAR/Command/Common.php
+++ b/inc/PEAR/Command/Common.php
diff --git a/inc/PEAR/Command/Config.php b/inc/PEAR/Command/Config.php
index 474a2345170..474a2345170 100755..100644
--- a/inc/PEAR/Command/Config.php
+++ b/inc/PEAR/Command/Config.php
diff --git a/inc/PEAR/Command/Install.php b/inc/PEAR/Command/Install.php
index dce52f017e2..dce52f017e2 100755..100644
--- a/inc/PEAR/Command/Install.php
+++ b/inc/PEAR/Command/Install.php
diff --git a/inc/PEAR/Command/Mirror.php b/inc/PEAR/Command/Mirror.php
index bf56c3db640..bf56c3db640 100755..100644
--- a/inc/PEAR/Command/Mirror.php
+++ b/inc/PEAR/Command/Mirror.php
diff --git a/inc/PEAR/Command/Package.php b/inc/PEAR/Command/Package.php
index aca87111118..aca87111118 100755..100644
--- a/inc/PEAR/Command/Package.php
+++ b/inc/PEAR/Command/Package.php
diff --git a/inc/PEAR/Command/Registry.php b/inc/PEAR/Command/Registry.php
index 62cb4b00e28..62cb4b00e28 100755..100644
--- a/inc/PEAR/Command/Registry.php
+++ b/inc/PEAR/Command/Registry.php
diff --git a/inc/PEAR/Command/Remote.php b/inc/PEAR/Command/Remote.php
index bbd16093f5d..bbd16093f5d 100755..100644
--- a/inc/PEAR/Command/Remote.php
+++ b/inc/PEAR/Command/Remote.php
diff --git a/inc/PEAR/Common.php b/inc/PEAR/Common.php
index fba53a37799..fba53a37799 100755..100644
--- a/inc/PEAR/Common.php
+++ b/inc/PEAR/Common.php
diff --git a/inc/PEAR/Config.php b/inc/PEAR/Config.php
index ba641735250..ba641735250 100755..100644
--- a/inc/PEAR/Config.php
+++ b/inc/PEAR/Config.php
diff --git a/inc/PEAR/Dependency.php b/inc/PEAR/Dependency.php
index 705167aa70f..705167aa70f 100755..100644
--- a/inc/PEAR/Dependency.php
+++ b/inc/PEAR/Dependency.php
diff --git a/inc/PEAR/Downloader.php b/inc/PEAR/Downloader.php
index 5e16dc5ffb1..5e16dc5ffb1 100755..100644
--- a/inc/PEAR/Downloader.php
+++ b/inc/PEAR/Downloader.php
diff --git a/inc/PEAR/ErrorStack.php b/inc/PEAR/ErrorStack.php
index da52f08d345..da52f08d345 100755..100644
--- a/inc/PEAR/ErrorStack.php
+++ b/inc/PEAR/ErrorStack.php
diff --git a/inc/PEAR/Exception.php b/inc/PEAR/Exception.php
index c735c16b398..c735c16b398 100755..100644
--- a/inc/PEAR/Exception.php
+++ b/inc/PEAR/Exception.php
diff --git a/inc/PEAR/Frontend/CLI.php b/inc/PEAR/Frontend/CLI.php
index 832ddf09b3f..832ddf09b3f 100755..100644
--- a/inc/PEAR/Frontend/CLI.php
+++ b/inc/PEAR/Frontend/CLI.php
diff --git a/inc/PEAR/Installer.php b/inc/PEAR/Installer.php
index 31e2cff81ee..31e2cff81ee 100755..100644
--- a/inc/PEAR/Installer.php
+++ b/inc/PEAR/Installer.php
diff --git a/inc/PEAR/Packager.php b/inc/PEAR/Packager.php
index 3ed209be8b2..3ed209be8b2 100755..100644
--- a/inc/PEAR/Packager.php
+++ b/inc/PEAR/Packager.php
diff --git a/inc/PEAR/Registry.php b/inc/PEAR/Registry.php
index f2510a38f15..f2510a38f15 100755..100644
--- a/inc/PEAR/Registry.php
+++ b/inc/PEAR/Registry.php
diff --git a/inc/PEAR/Remote.php b/inc/PEAR/Remote.php
index 7b1e314f903..7b1e314f903 100755..100644
--- a/inc/PEAR/Remote.php
+++ b/inc/PEAR/Remote.php
diff --git a/inc/PEAR/RunTest.php b/inc/PEAR/RunTest.php
index 1aa02aab9df..1aa02aab9df 100755..100644
--- a/inc/PEAR/RunTest.php
+++ b/inc/PEAR/RunTest.php
diff --git a/inc/PHPUnit.php b/inc/PHPUnit.php
index de4da858eb9..de4da858eb9 100755..100644
--- a/inc/PHPUnit.php
+++ b/inc/PHPUnit.php
diff --git a/inc/PHPUnit/Assert.php b/inc/PHPUnit/Assert.php
index 74806458bd3..74806458bd3 100755..100644
--- a/inc/PHPUnit/Assert.php
+++ b/inc/PHPUnit/Assert.php
diff --git a/inc/PHPUnit/GUI/Gtk.php b/inc/PHPUnit/GUI/Gtk.php
index fdd3a9931e5..fdd3a9931e5 100755..100644
--- a/inc/PHPUnit/GUI/Gtk.php
+++ b/inc/PHPUnit/GUI/Gtk.php
diff --git a/inc/PHPUnit/GUI/HTML.php b/inc/PHPUnit/GUI/HTML.php
index 773ab9af9f3..773ab9af9f3 100755..100644
--- a/inc/PHPUnit/GUI/HTML.php
+++ b/inc/PHPUnit/GUI/HTML.php
diff --git a/inc/PHPUnit/GUI/SetupDecorator.php b/inc/PHPUnit/GUI/SetupDecorator.php
index 73c3d8298e2..73c3d8298e2 100755..100644
--- a/inc/PHPUnit/GUI/SetupDecorator.php
+++ b/inc/PHPUnit/GUI/SetupDecorator.php
diff --git a/inc/PHPUnit/RepeatedTest.php b/inc/PHPUnit/RepeatedTest.php
index f8cbbc640f6..f8cbbc640f6 100755..100644
--- a/inc/PHPUnit/RepeatedTest.php
+++ b/inc/PHPUnit/RepeatedTest.php
diff --git a/inc/PHPUnit/Skeleton.php b/inc/PHPUnit/Skeleton.php
index 81fe3149066..81fe3149066 100755..100644
--- a/inc/PHPUnit/Skeleton.php
+++ b/inc/PHPUnit/Skeleton.php
diff --git a/inc/PHPUnit/TestCase.php b/inc/PHPUnit/TestCase.php
index 69594ed2f8e..69594ed2f8e 100755..100644
--- a/inc/PHPUnit/TestCase.php
+++ b/inc/PHPUnit/TestCase.php
diff --git a/inc/PHPUnit/TestDecorator.php b/inc/PHPUnit/TestDecorator.php
index 6486309a70b..6486309a70b 100755..100644
--- a/inc/PHPUnit/TestDecorator.php
+++ b/inc/PHPUnit/TestDecorator.php
diff --git a/inc/PHPUnit/TestFailure.php b/inc/PHPUnit/TestFailure.php
index 69c8b80bcbb..69c8b80bcbb 100755..100644
--- a/inc/PHPUnit/TestFailure.php
+++ b/inc/PHPUnit/TestFailure.php
diff --git a/inc/PHPUnit/TestListener.php b/inc/PHPUnit/TestListener.php
index 7685df46792..7685df46792 100755..100644
--- a/inc/PHPUnit/TestListener.php
+++ b/inc/PHPUnit/TestListener.php
diff --git a/inc/PHPUnit/TestResult.php b/inc/PHPUnit/TestResult.php
index ee60b2c5b50..ee60b2c5b50 100755..100644
--- a/inc/PHPUnit/TestResult.php
+++ b/inc/PHPUnit/TestResult.php
diff --git a/inc/PHPUnit/TestSuite.php b/inc/PHPUnit/TestSuite.php
index f2396748ba3..f2396748ba3 100755..100644
--- a/inc/PHPUnit/TestSuite.php
+++ b/inc/PHPUnit/TestSuite.php
diff --git a/inc/System.php b/inc/System.php
index a9279ff687d..a9279ff687d 100755..100644
--- a/inc/System.php
+++ b/inc/System.php
diff --git a/inc/XML/Parser.php b/inc/XML/Parser.php
index 6f77b5c66da..6f77b5c66da 100755..100644
--- a/inc/XML/Parser.php
+++ b/inc/XML/Parser.php
diff --git a/inc/XML/RPC.php b/inc/XML/RPC.php
index 2cdb44f4aea..2cdb44f4aea 100755..100644
--- a/inc/XML/RPC.php
+++ b/inc/XML/RPC.php
diff --git a/inc/XML/RPC/Server.php b/inc/XML/RPC/Server.php
index 5c5c04b1f7a..5c5c04b1f7a 100755..100644
--- a/inc/XML/RPC/Server.php
+++ b/inc/XML/RPC/Server.php
diff --git a/inc/docs/HTTP_WebDAV_Server/README b/inc/docs/HTTP_WebDAV_Server/README
index 9847b261684..9847b261684 100755..100644
--- a/inc/docs/HTTP_WebDAV_Server/README
+++ b/inc/docs/HTTP_WebDAV_Server/README
diff --git a/inc/docs/HTTP_WebDAV_Server/dav.txt b/inc/docs/HTTP_WebDAV_Server/dav.txt
index 9e0b8299229..9e0b8299229 100755..100644
--- a/inc/docs/HTTP_WebDAV_Server/dav.txt
+++ b/inc/docs/HTTP_WebDAV_Server/dav.txt
diff --git a/inc/docs/HTTP_WebDAV_Server/db/Fileserver.sql b/inc/docs/HTTP_WebDAV_Server/db/Fileserver.sql
index 8047d12f5e4..8047d12f5e4 100755..100644
--- a/inc/docs/HTTP_WebDAV_Server/db/Fileserver.sql
+++ b/inc/docs/HTTP_WebDAV_Server/db/Fileserver.sql
diff --git a/inc/lib_base.php b/inc/lib_base.php
index df6df15cc23..df6df15cc23 100755..100644
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
diff --git a/inc/lib_files.php b/inc/lib_files.php
index 009de854d3f..009de854d3f 100755..100644
--- a/inc/lib_files.php
+++ b/inc/lib_files.php
diff --git a/inc/lib_filestorage.php b/inc/lib_filestorage.php
index b63dd200b36..b63dd200b36 100755..100644
--- a/inc/lib_filestorage.php
+++ b/inc/lib_filestorage.php
diff --git a/inc/lib_filesystem.php b/inc/lib_filesystem.php
index 492e0c5d382..492e0c5d382 100755..100644
--- a/inc/lib_filesystem.php
+++ b/inc/lib_filesystem.php
diff --git a/inc/lib_log.php b/inc/lib_log.php
index 989308c82fc..989308c82fc 100755..100644
--- a/inc/lib_log.php
+++ b/inc/lib_log.php
diff --git a/inc/lib_ocs.php b/inc/lib_ocs.php
index 72d2adb1798..891ca192c0b 100755..100644
--- a/inc/lib_ocs.php
+++ b/inc/lib_ocs.php
@@ -133,10 +133,21 @@ class OC_OCS {
       $message=OC_OCS::readdata('message','text');
       OC_OCS::activityput($format,$message);
 
+    // PRIVATEDATA
+    // get - GET DATA
+    }elseif(($method=='get') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='privatedata')){
+      $key=OC_OCS::readdata('key','text');
+      OC_OCS::privateDataGet($key);
+
+    // set - POST DATA
+    }elseif(($method=='post') and (strtolower($ex[$paracount-3])=='v1.php')and (strtolower($ex[$paracount-2])=='privatedata')){
+      $key=OC_OCS::readdata('key','text');
+      $value=OC_OCS::readdata('key','text');
+      OC_OCS::privatedataset($key, $value);
 
     }else{
       $format=OC_OCS::readdata('format','text');
-      $txt='please check the syntax. api specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services'."\n";
+      $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
       $txt.=OC_OCS::getdebugoutput();
       echo(OC_OCS::generatexml($format,'failed',999,$txt));
     }
@@ -418,8 +429,58 @@ class OC_OCS {
     echo(OC_OCS::generatexml($format,'ok',100,''));
   }
 
+  // PRIVATEDATA API #############################################
 
+  /**
+   * get private data
+   * @param string $key
+   * @return string xml/json
+   */
+  private static function privateDataGet($key) {
+	global $CONFIG_DBTABLEPREFIX;
+
+    $user=OC_OCS::checkpassword();
+
+    $result = OC_DB::select("select key,value,timestamp from {$CONFIG_DBTABLEPREFIX}privatedata where key like'% ".addslashes($key)."%' order by timestamp desc");
+    $itemscount=count($result);
+
+    $xml=array();
+    foreach($result as $i=>$log) {
+      $xml[$i]['key']=$log['key'];
+      $xml[$i]['value']=$log['value'];
+      $xml[$i]['timestamp']=$log['timestamp'];
+    }
+
+
+    $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize);
+    echo($txt);
+  }
+
+  /**
+   * set private data referenced by $key to $valu`
+   * @param string $key
+   * @param string $value
+   * @return string xml/json
+   */
+  private static function privateDataSet($key, $value) {
+	global $CONFIG_DBTABLEPREFIX;
+
+    //TODO: prepared statements, locking tables, fancy stuff, error checking/handling
+    $user=OC_OCS::checkpassword();
 
+    $result = OC_DB::query("select count(*) as co from {$CONFIG_DBTABLEPREFIX}privatedata where key = '".$key."'");
+    $entry=$result->fetchRow();
+    $existing=$entry['co'];
+    OC_DB::free_result($result);
+
+    if ($existing != 0) {
+        $result = OC_DB::query("update {$CONFIG_DBTABLEPREFIX}privatedata set value='".addslashes($value)."', timestamp = now() where key = '".addslashes($key)."'");
+    } else {
+        $result = OC_DB::query("insert into {$CONFIG_DBTABLEPREFIX}privatedata(key, value, timestamp) values('".addslashes($key)."', '".addslashes($value)."', now())");
+    }
+
+    echo(OC_OCS::generatexml($format,'ok',100,''));
+  }
 }
 
 
diff --git a/inc/lib_user.php b/inc/lib_user.php
index 5fbde168ace..5fbde168ace 100755..100644
--- a/inc/lib_user.php
+++ b/inc/lib_user.php
diff --git a/inc/package.dtd b/inc/package.dtd
index 6092e8f4ce3..6092e8f4ce3 100755..100644
--- a/inc/package.dtd
+++ b/inc/package.dtd
diff --git a/inc/packages/Archive_Tar.xml b/inc/packages/Archive_Tar.xml
index ba748a18afd..ba748a18afd 100755..100644
--- a/inc/packages/Archive_Tar.xml
+++ b/inc/packages/Archive_Tar.xml
diff --git a/inc/packages/Console_Getopt.xml b/inc/packages/Console_Getopt.xml
index 221919d9767..221919d9767 100755..100644
--- a/inc/packages/Console_Getopt.xml
+++ b/inc/packages/Console_Getopt.xml
diff --git a/inc/packages/DB.xml b/inc/packages/DB.xml
index d8aaec82c27..d8aaec82c27 100755..100644
--- a/inc/packages/DB.xml
+++ b/inc/packages/DB.xml
diff --git a/inc/packages/Log.xml b/inc/packages/Log.xml
index de16370c8bf..de16370c8bf 100755..100644
--- a/inc/packages/Log.xml
+++ b/inc/packages/Log.xml
diff --git a/inc/packages/Mail.xml b/inc/packages/Mail.xml
index 0fbd10ac951..0fbd10ac951 100755..100644
--- a/inc/packages/Mail.xml
+++ b/inc/packages/Mail.xml
diff --git a/inc/packages/Mail_Mime.xml b/inc/packages/Mail_Mime.xml
index ddf734f0c28..ddf734f0c28 100755..100644
--- a/inc/packages/Mail_Mime.xml
+++ b/inc/packages/Mail_Mime.xml
diff --git a/inc/packages/Net_SMTP.xml b/inc/packages/Net_SMTP.xml
index d1e8c56332e..d1e8c56332e 100755..100644
--- a/inc/packages/Net_SMTP.xml
+++ b/inc/packages/Net_SMTP.xml
diff --git a/inc/packages/Net_Socket.xml b/inc/packages/Net_Socket.xml
index 9c7eae00940..9c7eae00940 100755..100644
--- a/inc/packages/Net_Socket.xml
+++ b/inc/packages/Net_Socket.xml
diff --git a/inc/packages/PEAR.xml b/inc/packages/PEAR.xml
index 83800a16a0d..83800a16a0d 100755..100644
--- a/inc/packages/PEAR.xml
+++ b/inc/packages/PEAR.xml
diff --git a/inc/packages/PHPUnit.xml b/inc/packages/PHPUnit.xml
index 71e736764db..71e736764db 100755..100644
--- a/inc/packages/PHPUnit.xml
+++ b/inc/packages/PHPUnit.xml
diff --git a/inc/packages/XML_Parser.xml b/inc/packages/XML_Parser.xml
index 9b4b0269faf..9b4b0269faf 100755..100644
--- a/inc/packages/XML_Parser.xml
+++ b/inc/packages/XML_Parser.xml
diff --git a/inc/packages/XML_RPC.xml b/inc/packages/XML_RPC.xml
index 44e94882647..44e94882647 100755..100644
--- a/inc/packages/XML_RPC.xml
+++ b/inc/packages/XML_RPC.xml
diff --git a/inc/pearcmd.php b/inc/pearcmd.php
index 28a81dcf67f..28a81dcf67f 100755..100644
--- a/inc/pearcmd.php
+++ b/inc/pearcmd.php
diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index 882c0dd3778..882c0dd3778 100755..100644
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
diff --git a/inc/templates/configform.php b/inc/templates/configform.php
index e53235cf820..e53235cf820 100755..100644
--- a/inc/templates/configform.php
+++ b/inc/templates/configform.php
diff --git a/inc/templates/footer.php b/inc/templates/footer.php
index 47bebd27e02..47bebd27e02 100755..100644
--- a/inc/templates/footer.php
+++ b/inc/templates/footer.php
diff --git a/inc/templates/header.php b/inc/templates/header.php
index e016cd9f021..e016cd9f021 100755..100644
--- a/inc/templates/header.php
+++ b/inc/templates/header.php
diff --git a/inc/templates/loginform.php b/inc/templates/loginform.php
index 41c86eef013..41c86eef013 100755..100644
--- a/inc/templates/loginform.php
+++ b/inc/templates/loginform.php
diff --git a/index.php b/index.php
index 52013d108ea..52013d108ea 100755..100644
--- a/index.php
+++ b/index.php
diff --git a/js/ajax.js b/js/ajax.js
index 534dd46a290..534dd46a290 100755..100644
--- a/js/ajax.js
+++ b/js/ajax.js
diff --git a/js/filebrowser.js b/js/filebrowser.js
index aae6cdf7720..aae6cdf7720 100755..100644
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
diff --git a/js/lib_ajax.js b/js/lib_ajax.js
index 62899a9cd06..62899a9cd06 100755..100644
--- a/js/lib_ajax.js
+++ b/js/lib_ajax.js
diff --git a/js/lib_api.js b/js/lib_api.js
index 51fc843967d..51fc843967d 100755..100644
--- a/js/lib_api.js
+++ b/js/lib_api.js
diff --git a/js/lib_drag.js b/js/lib_drag.js
index 5e6ae8ccadc..5e6ae8ccadc 100755..100644
--- a/js/lib_drag.js
+++ b/js/lib_drag.js
diff --git a/js/lib_event.js b/js/lib_event.js
index f44a2049fb2..f44a2049fb2 100755..100644
--- a/js/lib_event.js
+++ b/js/lib_event.js
diff --git a/js/lib_files.js b/js/lib_files.js
index 68c3c611291..68c3c611291 100755..100644
--- a/js/lib_files.js
+++ b/js/lib_files.js
diff --git a/js/lib_notification.js b/js/lib_notification.js
index 7c19a04b58e..7c19a04b58e 100755..100644
--- a/js/lib_notification.js
+++ b/js/lib_notification.js
diff --git a/js/lib_timer.js b/js/lib_timer.js
index aadea90ba27..aadea90ba27 100755..100644
--- a/js/lib_timer.js
+++ b/js/lib_timer.js
diff --git a/js/lib_xmlloader.js b/js/lib_xmlloader.js
index 12ebfa474b6..12ebfa474b6 100755..100644
--- a/js/lib_xmlloader.js
+++ b/js/lib_xmlloader.js
diff --git a/log/index.php b/log/index.php
index 3b10027f9cb..3b10027f9cb 100755..100644
--- a/log/index.php
+++ b/log/index.php
diff --git a/ocs/providers.php b/ocs/providers.php
index 93ab38f838f..93ab38f838f 100755..100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
diff --git a/ocs/v1.php b/ocs/v1.php
index 2419658ff10..2419658ff10 100755..100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
diff --git a/plugins/music/index.php b/plugins/music/index.php
index 737b9ff79c6..737b9ff79c6 100755..100644
--- a/plugins/music/index.php
+++ b/plugins/music/index.php
diff --git a/plugins/music/lib_music.php b/plugins/music/lib_music.php
index e1262737f06..e1262737f06 100755..100644
--- a/plugins/music/lib_music.php
+++ b/plugins/music/lib_music.php
diff --git a/plugins/test/index.php b/plugins/test/index.php
index 737b9ff79c6..737b9ff79c6 100755..100644
--- a/plugins/test/index.php
+++ b/plugins/test/index.php
diff --git a/plugins/test/lib_test.php b/plugins/test/lib_test.php
index bce0d30320b..bce0d30320b 100755..100644
--- a/plugins/test/lib_test.php
+++ b/plugins/test/lib_test.php
diff --git a/settings/index.php b/settings/index.php
index d5e7451d08b..d5e7451d08b 100755..100644
--- a/settings/index.php
+++ b/settings/index.php
diff --git a/webdav/owncloud.php b/webdav/owncloud.php
index 575e9b43a92..575e9b43a92 100755..100644
--- a/webdav/owncloud.php
+++ b/webdav/owncloud.php