Merge branch 'master' into sharing_mail_notification_master

increased version number to trigger db update

Conflicts:
	lib/util.php

diff --cc apps/files/templates/index.php
Simple merge

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

diff --cc lib/util.php
index 6f856b22010d5898daa77276b5e34d51a6c8d820,0777643a952978b1a9a44323b82d1d92db4988ea..de57f75d8650c296e77aaf6b6861a80665745a61
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -98,7 -108,7 +108,7 @@@ class OC_Util 
        public static function getVersion() {
                // hint: We only can count up. Reset minor/patchlevel when
                // updating major/minor version number.
--              return array(5, 80, 07);
++              return array(5, 80, 08);
        }
  
        /**
@@@ -352,17 -414,18 +414,18 @@@
                                $encryptedFiles = true;
                        }
                }
 -              
 +
                return $encryptedFiles;
        }
 -      
 +
        /**
-       * Check for correct file permissions of data directory
-       * @return array arrays with error messages and hints
-       */
+        * @brief Check for correct file permissions of data directory
+        * @paran string $dataDirectory
+        * @return array arrays with error messages and hints
+        */
        public static function checkDataDirectoryPermissions($dataDirectory) {
                $errors = array();
-               if (stristr(PHP_OS, 'WIN')) {
+               if (self::runningOnWindows()) {
                        //TODO: permissions checks for windows hosts
                } else {
                        $permissionsModHint = 'Please change the permissions to 0770 so that the directory'
@@@ -727,16 -805,15 +805,15 @@@
                        if ($connected) {
                                fclose($connected);
                                return true;
-                       }else{
+                       } else {
                                return false;
                        }
- 
                }
- 
        }
 -      
 +
        /**
-        * Check if the connection to the internet is disabled on purpose
+        * @brief Check if the connection to the internet is disabled on purpose
+        * @return bool
         */
        public static function isInternetConnectionEnabled(){
                return \OC_Config::getValue("has_internet_connection", true);

diff --cc settings/admin.php
Simple merge