diff options
author | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:42:22 +0100 |
---|---|---|
committer | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:42:22 +0100 |
commit | 9fdd1bafdc2aafcf27b939ba259818830f2df25e (patch) | |
tree | e3adba60b879b3b6199abbbd5457807435ff4791 /lib/util.php | |
parent | efecb694eff7129d1ca24627ac366f3bcc939864 (diff) | |
parent | 5e711f37ca3f009317a3c8cd0e47ed4f15922142 (diff) | |
download | nextcloud-server-9fdd1bafdc2aafcf27b939ba259818830f2df25e.tar.gz nextcloud-server-9fdd1bafdc2aafcf27b939ba259818830f2df25e.zip |
Merge branch 'master' into filesystem
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lib/util.php b/lib/util.php index d70c7c605c1..466b58078ca 100644 --- a/lib/util.php +++ b/lib/util.php @@ -180,7 +180,6 @@ class OC_Util { } $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" ); - $serverUser=OC_Util::checkWebserverUser(); //common hint for all file permissons error messages $permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory"; @@ -239,21 +238,6 @@ class OC_Util { OC_Template::printGuestPage("", "login", $parameters); } - /** - * Try to get the username the httpd server runs on, used in hints - */ - public static function checkWebserverUser(){ - if(is_callable('posix_getuid')){ - $serverUser=posix_getpwuid(posix_getuid()); - $serverUser='\''.$serverUser['name'].'\''; - }elseif(exec('whoami')){ - $serverUser=exec('whoami'); - }else{ - $serverUser='\'www-data\' for ubuntu/debian'; //TODO: try to detect the distro and give a guess based on that - } - return $serverUser; - } - /** * Check if the app is enabled, send json error msg if not |