From 1495ec0f31b63c9bb04047f47cbf68abaab30b12 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Apr 2011 15:47:27 +0200 Subject: [PATCH 1/3] show server configuration errors on seperate page --- index.php | 10 +++++++--- lib/base.php | 36 +++++++++++++++++++++++------------- templates/error.php | 15 +++++++++++++++ 3 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 templates/error.php diff --git a/index.php b/index.php index 8f5c99fcd8..105a04ad76 100644 --- a/index.php +++ b/index.php @@ -24,7 +24,12 @@ require_once( 'lib/base.php' ); require_once( 'appconfig.php' ); require_once( 'template.php' ); -if( OC_USER::isLoggedIn()){ + +// check if the server is correctly configured for ownCloud +$errors=OC_UTIL::checkServer(); +if(count($errors)>0){ + OC_TEMPLATE::printGuestPage( "", "error", array( "errors" => $errors )); +}elseif( OC_USER::isLoggedIn()){ if( $_GET["logout"] ){ OC_USER::logout(); header( "Location: $WEBROOT"); @@ -34,8 +39,7 @@ if( OC_USER::isLoggedIn()){ header( "Location: ".OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" )); exit(); } -} -else{ +}else{ if( OC_USER::login( $_POST["user"], $_POST["password"] )){ header( "Location: ".OC_APPCONFIG::getValue( "core", "defaultpage", "files/index.php" )); exit(); diff --git a/lib/base.php b/lib/base.php index 6b3ca59e6b..31d4142900 100644 --- a/lib/base.php +++ b/lib/base.php @@ -89,13 +89,17 @@ require_once('connect.php'); require_once('remotestorage.php'); require_once('plugin.php'); -OC_PLUGIN::loadPlugins( "" ); +$error=(count(OC_UTIL::checkServer())>0); + +if(!$error){ + OC_PLUGIN::loadPlugins( "" ); +} OC_USER::setBackend( OC_CONFIG::getValue( "userbackend", "database" )); OC_GROUP::setBackend( OC_CONFIG::getValue( "groupbackend", "database" )); // Set up file system unless forbidden -if( !$RUNTIME_NOSETUPFS ){ +if(!$error and !$RUNTIME_NOSETUPFS ){ OC_UTIL::setupFS(); } @@ -108,12 +112,10 @@ OC_UTIL::addStyle( "jquery-ui-1.8.10.custom" ); OC_UTIL::addStyle( "styles" ); // Load Apps -if( !$RUNTIME_NOAPPS ){ +if(!$error and !$RUNTIME_NOAPPS ){ OC_APP::loadApps(); } -// check if the server is correctly configured for ownCloud -OC_UTIL::checkserver(); /** * Class for utility functions * @@ -221,7 +223,7 @@ class OC_UTIL { /** * check if the current server configuration is suitable for ownCloud - * + * @return array with error messages */ public static function checkServer(){ global $SERVERROOT; @@ -230,12 +232,16 @@ class OC_UTIL { $CONFIG_DATADIRECTORY_ROOT = OC_CONFIG::getValue( "datadirectory", "$SERVERROOT/data" );; $CONFIG_BACKUPDIRECTORY = OC_CONFIG::getValue( "backupdirectory", "$SERVERROOT/backup" ); $CONFIG_INSTALLED = OC_CONFIG::getValue( "installed", false ); - $error=''; + $errors=array(); + + //check for database drivers if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){ - $error.='No database drivers (sqlite or mysql) installed.
'; + $errors[]='No database drivers (sqlite or mysql) installed.
'; } $CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" ); $CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" ); + + //check for correct file permissions if(!stristr(PHP_OS, 'WIN')){ if($CONFIG_DBTYPE=='sqlite'){ $file=$SERVERROOT.'/'.$CONFIG_DBNAME; @@ -246,7 +252,7 @@ class OC_UTIL { clearstatcache(); $prems=substr(decoct(fileperms($file)),-3); if(substr($prems,2,1)!='0'){ - $error.='SQLite database file ('.$file.') is readable from the web
'; + $errors[]='SQLite database file ('.$file.') is readable from the web
'; } } } @@ -257,7 +263,7 @@ class OC_UTIL { clearstatcache(); $prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3); if(substr($prems,2,1)!='0'){ - $error.='Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web
'; + $errors[]='Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web
'; } } if( OC_CONFIG::getValue( "enablebackup", false )){ @@ -267,16 +273,20 @@ class OC_UTIL { clearstatcache(); $prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3); if(substr($prems,2,1)!='0'){ - $error.='Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web
'; + $errors[]='Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web
'; } } } }else{ //TODO: premisions checks for windows hosts } - if($error){ - die($error); + if(!is_writable($CONFIG_DATADIRECTORY_ROOT)){ + $errors[]='Data directory ('.$CONFIG_BACKUPDIRECTORY.') not writable by ownCloud
'; } + + //TODO: check for php modules + + return $errors; } } diff --git a/templates/error.php b/templates/error.php new file mode 100644 index 0000000000..e8f56d63bd --- /dev/null +++ b/templates/error.php @@ -0,0 +1,15 @@ + +
+ " alt="ownCloud" /> +



+ +
+ From 318d024cc1c7c5d8f32e828f2fc9b9f1db65a27c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Apr 2011 17:07:44 +0200 Subject: [PATCH 2/3] show size of folders in filebrowser --- files/templates/index.php | 2 +- lib/files.php | 1 + lib/filestorage.php | 70 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/files/templates/index.php b/files/templates/index.php index 695a3c45a9..f1fdafc27c 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -33,7 +33,7 @@ )" href="" title=""> - + + diff --git a/lib/files.php b/lib/files.php index a1f983b6b2..642a7e7204 100644 --- a/lib/files.php +++ b/lib/files.php @@ -64,6 +64,7 @@ class OC_FILES { $file['directory']=$directory; $stat=OC_FILESYSTEM::stat($directory.'/'.$filename); $file=array_merge($file,$stat); + $file['size']=OC_FILESYSTEM::filesize($directory.'/'.$filename); $file['mime']=OC_FILES::getMimeType($directory .'/'. $filename); $file['readable']=OC_FILESYSTEM::is_readable($directory .'/'. $filename); $file['writeable']=OC_FILESYSTEM::is_writeable($directory .'/'. $filename); diff --git a/lib/filestorage.php b/lib/filestorage.php index 68f232d3a6..e7fb9e9d27 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -124,7 +124,11 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{ return $filetype; } public function filesize($path){ - return filesize($this->datadir.$path); + if($this->is_dir($path)){ + return $this->getFolderSize($path); + }else{ + return filesize($this->datadir.$path); + } } public function is_readable($path){ return is_readable($this->datadir.$path); @@ -159,6 +163,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{ public function file_put_contents($path,$data){ if($return=file_put_contents($this->datadir.$path,$data)){ $this->notifyObservers($path,OC_FILEACTION_WRITE); + $this->clearFolderSizeCache($path); } } public function unlink($path){ @@ -197,11 +202,13 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{ case 'x+': case 'a+': $this->notifyObservers($path,OC_FILEACTION_READ | OC_FILEACTION_WRITE); + $this->clearFolderSizeCache($path); break; case 'w': case 'x': case 'a': $this->notifyObservers($path,OC_FILEACTION_WRITE); + $this->clearFolderSizeCache($path); break; } } @@ -440,5 +447,66 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{ } return $return; } + + /** + * @brief get the size of folder and it's content + * @param string $path file path + * @return int size of folder and it's content + */ + public function getFolderSize($path){ + $query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?"); + $size=$query->execute(array($path))->fetchAll(); + if(count($size)>0){// we already the size, just return it + return $size[0]['size']; + }else{//the size of the folder isn't know, calulate it + return $this->calculateFolderSize($path); + } + } + + /** + * @brief calulate the size of folder and it's content and cache it + * @param string $path file path + * @return int size of folder and it's content + */ + public function calculateFolderSize($path){ + $size=0; + if ($dh = $this->opendir($path)) { + while (($filename = readdir($dh)) !== false) { + if($filename!='.' and $filename!='..'){ + $subFile=$path.'/'.$filename; + if($this->is_file($subFile)){ + $size+=$this->filesize($subFile); + }else{ + $size+=$this->calculateFolderSize($subFile); + } + } + } + $query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?"); + $hasSize=$query->execute(array($path))->fetchAll(); + if(count($hasSize)>0){// yes, update it + $query=OC_DB::prepare("UPDATE *PREFIX*foldersize SET size=? WHERE path=?"); + $result=$query->execute(array($size,$path)); + }else{// no insert it + $query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)"); + $result=$query->execute(array($path,$size)); + } + } + return $size; + } + + /** + * @brief clear the folder size cache of folders containing a file + * @param string $path + */ + public function clearFolderSizeCache($path){ + $path=dirname($path); + $query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?"); + $result=$query->execute(array($path)); + if($path!='/'){ + $parts=explode('/'); + array_pop($parts); + $parent=implode('/',$parts); + } + } } ?> \ No newline at end of file From 6c51974174f8a78045216567474c380525f77ce9 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 16 Apr 2011 17:35:32 +0200 Subject: [PATCH 3/3] add foldersize table to owncloud.sql --- docs/owncloud.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/owncloud.sql b/docs/owncloud.sql index 3f96a4540e..75812ad3c7 100644 --- a/docs/owncloud.sql +++ b/docs/owncloud.sql @@ -173,3 +173,13 @@ CREATE TABLE IF NOT EXISTS `users` ( -- -- Daten für Tabelle `users` -- + +-- +-- Table structure for table `foldersize` +-- + +CREATE TABLE IF NOT EXISTS `foldersize` ( + `path` varchar(512) NOT NULL, + `size` int(11) NOT NULL, + PRIMARY KEY (`path`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; \ No newline at end of file