Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
	lib/private/appconfig.php

diff --cc apps/files_encryption/hooks/hooks.php
Simple merge

diff --cc apps/files_encryption/tests/util.php
Simple merge

diff --cc apps/files_external/lib/config.php
Simple merge

diff --cc apps/files_sharing/lib/cache.php
Simple merge

diff --cc apps/files_trashbin/lib/trashbin.php
Simple merge

diff --cc apps/user_ldap/lib/access.php
Simple merge

diff --cc apps/user_ldap/lib/ildapwrapper.php
Simple merge

diff --cc apps/user_ldap/lib/ldap.php
Simple merge

diff --cc apps/user_ldap/lib/wizard.php
Simple merge

diff --cc apps/user_ldap/user_ldap.php
index f983c7835afd9a74bfe5d09cc606987bca962b5e,619a992bd122e2ba2b7d5c850c683c16a0f250b3..1088dafab7154e24a73cd7b1a2cdb8160f8b1d20
--- 1/apps/user_ldap/user_ldap.php
--- 2/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@@ -137,11 -135,31 +135,31 @@@ class USER_LDAP extends BackendUtility 
                return false;
        }
  
+       /**
+        * @brief reads the image from LDAP that shall be used as Avatar
+        * @param $uid string, the ownCloud user name
+        * @param $dn string, the user DN
+        * @return image data (provided by LDAP) | false
+        */
+       private function getAvatarImage($uid, $dn) {
+               $attributes = array('jpegPhoto', 'thumbnailPhoto');
+               foreach($attributes as $attribute) {
+                       $result = $this->access->readAttribute($dn, $attribute);
+                       \OCP\Config::setUserValue($uid, 'user_ldap', 'lastJpegPhotoLookup',
+                                                                         time());
+                       if($result !== false && is_array($result) && isset($result[0])) {
+                               return $result[0];
+                       }
+               }
+ 
+               return false;
+       }
+ 
        /**
         * @brief Check if the password is correct
 -       * @param $uid The username
 -       * @param $password The password
 -       * @returns true/false
 +       * @param string $uid The username
 +       * @param string $password The password
 +       * @return boolean
         *
         * Check if the password is correct without logging in the user
         */

diff --cc lib/private/appconfig.php
index 5da0a7e906b742f4852ddd00251f8336cb8af5f9,a47e1ad49e6eb45728cbb8f1130eedc618b67ec8..a32c1126c7bcd91f8687c5c2c81b527239c202d4
--- 1/lib/private/appconfig.php
--- 2/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@@ -180,16 -185,18 +185,16 @@@ class AppConfig implements \OCP\IAppCon
         * @param string $app app
         * @param string $key key
         * @return bool
 -       *
 -       * Deletes a key.
         */
-       public static function deleteKey($app, $key) {
-               // Boring!
-               $query = OC_DB::prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?');
-               $query->execute(array($app, $key));
-               if (isset(self::$cache[$app]) and isset(self::$cache[$app][$key])) {
-                       unset(self::$cache[$app][$key]);
+       public function deleteKey($app, $key) {
+               $where = array(
+                       'appid' => $app,
+                       'configkey' => $key,
+               );
+               $this->conn->delete('*PREFIX*appconfig', $where);
+               if (isset($this->cache[$app]) and isset($this->cache[$app][$key])) {
+                       unset($this->cache[$app][$key]);
                }
- 
-               return true;
        }
  
        /**
@@@ -211,14 -217,15 +215,15 @@@
        /**
         * get multiply values, either the app or key can be used as wildcard by setting it to false
         *
 -       * @param app
 -       * @param key
 +       * @param boolean $app
 +       * @param string $key
         * @return array
         */
-       public static function getValues($app, $key) {
-               if ($app !== false and $key !== false) {
+       public function getValues($app, $key) {
+               if (($app !== false) == ($key !== false)) {
                        return false;
                }
+ 
                $fields = '`configvalue`';
                $where = 'WHERE';
                $params = array();

diff --cc lib/private/db/statementwrapper.php
Simple merge

diff --cc lib/private/files.php
Simple merge

diff --cc lib/private/files/cache/storage.php
Simple merge

diff --cc lib/private/files/storage/common.php
Simple merge

diff --cc lib/private/files/storage/local.php
Simple merge

diff --cc lib/private/files/view.php
Simple merge

diff --cc lib/private/image.php
Simple merge

diff --cc lib/private/l10n.php
Simple merge

diff --cc lib/private/request.php
Simple merge

diff --cc lib/private/response.php
Simple merge

diff --cc lib/private/user.php
Simple merge

diff --cc lib/public/files/storage.php
Simple merge

diff --cc lib/public/share.php
Simple merge